summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-06-09 16:11:15 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2009-06-09 16:11:15 +0200
commitaa16679ccb39598b9b4546c912af1cf8c70e529b (patch)
tree996f5916d12bed8fa3464405bf8090aa3b864354
parente729233f0c20656bf41f8254d03160191e2f4d81 (diff)
parenteac9121ea9d2b4180399f4b63f88491f8e0f1a8a (diff)
merged from the debian-sid branch
-rw-r--r--apt-pkg/acquire.h2
-rw-r--r--apt-pkg/contrib/configuration.cc4
-rw-r--r--apt-pkg/deb/debsystem.cc1
-rw-r--r--cmdline/apt-get.cc3
-rw-r--r--configure.in3
-rw-r--r--debian/changelog67
-rw-r--r--doc/fr/apt-get.fr.8.xml2
-rw-r--r--methods/http.cc1
-rw-r--r--po/ChangeLog40
-rw-r--r--po/apt-all.pot52
-rw-r--r--po/ar.po1032
-rw-r--r--po/ast.po2899
-rw-r--r--po/bg.po222
-rw-r--r--po/bs.po216
-rw-r--r--po/ca.po73
-rw-r--r--po/cs.po222
-rw-r--r--po/cy.po216
-rw-r--r--po/da.po252
-rw-r--r--po/de.po222
-rw-r--r--po/dz.po252
-rw-r--r--po/el.po253
-rw-r--r--po/en_GB.po222
-rw-r--r--po/es.po222
-rw-r--r--po/eu.po19
-rw-r--r--po/fi.po222
-rw-r--r--po/fr.po188
-rw-r--r--po/gl.po222
-rw-r--r--po/he.po216
-rw-r--r--po/hu.po253
-rw-r--r--po/it.po1130
-rw-r--r--po/ja.po222
-rw-r--r--po/km.po252
-rw-r--r--po/ko.po222
-rw-r--r--po/ku.po216
-rw-r--r--po/lt.po7
-rw-r--r--po/mr.po222
-rw-r--r--po/nb.po229
-rw-r--r--po/ne.po252
-rw-r--r--po/nl.po253
-rw-r--r--po/nn.po252
-rw-r--r--po/pl.po222
-rw-r--r--po/pt.po222
-rw-r--r--po/pt_BR.po222
-rw-r--r--po/ro.po222
-rw-r--r--po/ru.po301
-rw-r--r--po/sk.po251
-rw-r--r--po/sl.po252
-rw-r--r--po/sv.po252
-rw-r--r--po/th.po258
-rw-r--r--po/tl.po252
-rw-r--r--po/uk.po252
-rw-r--r--po/vi.po222
-rw-r--r--po/zh_CN.po16
-rw-r--r--po/zh_TW.po226
54 files changed, 8976 insertions, 5049 deletions
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 1de6f5e44..eaadded55 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -539,7 +539,7 @@ class pkgAcquire::UriIterator
public:
- inline void operator ++() {operator ++();};
+ inline void operator ++() {operator ++(0);};
void operator ++(int)
{
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 7326b84ea..a82311a3f 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -182,9 +182,9 @@ string Configuration::FindFile(const char *Name,const char *Default) const
if (Itm == 0 || Itm->Value.empty() == true)
{
if (Default == 0)
- return "";
+ return rootDir;
else
- return Default;
+ return rootDir + Default;
}
string val = Itm->Value;
diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index 186918d25..089a465c1 100644
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -18,7 +18,6 @@
#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
#include <apti18n.h>
-
#include <sys/types.h>
#include <unistd.h>
#include <dirent.h>
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 988abe216..adb1c9214 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1301,9 +1301,8 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0)
{
string Ver = Parse->Version();
-
// show name mismatches
- if (IsMatch == true && Parse->Package() != Src)
+ if (IsMatch == true && Parse->Package() != Src)
ioprintf(c1out, _("No source package '%s' picking '%s' instead\n"), Parse->Package().c_str(), Src.c_str());
if (VerTag.empty() == false)
diff --git a/configure.in b/configure.in
index 130fe065d..f590310a4 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,8 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.20.2ubuntu5")
+
+AC_DEFINE_UNQUOTED(VERSION,"0.7.21")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/changelog b/debian/changelog
index 8958bdfb7..2d2153d07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,73 @@
-apt (0.7.20.2ubuntu8) UNRELEASEDkarmic; urgency=low
+apt (0.7.21ubuntu1) karmic; urgency=low
+ * merged from the debian-sid bzr branch
+
+ [ Christian Perrier ]
+ * Documentation translations:
+ - Fix a typo in apt-get(8) French translation. Closes: #525043
+ Thanks to Guillaume Delacour for spotting it.
+ * Translations:
+ - fr.po
+ - sk.po. Closes: #525857
+ - ru.po. Closes: #526816
+ - eu.po. Closes: #528985
+ - zh_CN.po. Closes: #531390
+ - fr.po
+ - it.po. Closes: #531758
+ - ca.po. Closes: #531921
+ * Added translations
+ - ast.po (Asturian by Marcos Alvareez Costales).
+ Closes: #529007, #529730
+
+ [ Michael Vogt ]
* apt-pkg/acquire.cc:
- make the max pipeline depth of the acquire queue configurable
via Acquire::Max-Pipeline-Depth
- -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 28 May 2009 17:51:42 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Jun 2009 15:49:07 +0200
+
+apt (0.7.21) unstable; urgency=low
+
+ [ Christian Perrier ]
+ * Translations:
+ - bg.po. Closes: #513211
+ - zh_TW.po. Closes: #513311
+ - nb.po. Closes: #513843
+ - fr.po. Closes: #520430
+ - sv.po. Closes: #518070
+ - sk.po. Closes: #520403
+ - it.po. Closes: #522222
+ - sk.po. Closes: #520403
+
+ [ Jamie Strandboge ]
+ * apt.cron.daily: catch invalid dates due to DST time changes
+ in the stamp files
+
+ [ Michael Vogt ]
+ * methods/gpgv.cc:
+ - properly check for expired and revoked keys (closes: #433091)
+ * apt-pkg/contrib/strutl.cc:
+ - fix TimeToStr i18n (LP: #289807)
+ * [ABI break] merge support for http redirects, thanks to
+ Jeff Licquia and Anthony Towns
+ * [ABI break] use int for the package IDs (thanks to Steve Cotton)
+ * apt-pkg/pkgcache.cc:
+ - do not run "dpkg --configure pkg" if pkg is in trigger-awaited
+ state (LP: #322955)
+ * methods/https.cc:
+ - add Acquire::https::AllowRedirect support
+ * Clarify the --help for 'purge' (LP: #243948)
+ * cmdline/apt-get.cc
+ - fix "apt-get source pkg" if there is a binary package and
+ a source package of the same name but from different
+ packages (LP: #330103)
+
+ [ Colin Watson ]
+ * cmdline/acqprogress.cc:
+ - Call pkgAcquireStatus::Pulse even if quiet, so that we still get
+ dlstatus messages on the status-fd (LP: #290234).
+
+ -- Michael Vogt <mvo@debian.org> Tue, 14 Apr 2009 14:12:51 +0200
apt (0.7.20.2ubuntu7) karmic; urgency=low
diff --git a/doc/fr/apt-get.fr.8.xml b/doc/fr/apt-get.fr.8.xml
index dccf415b1..c1b8552cb 100644
--- a/doc/fr/apt-get.fr.8.xml
+++ b/doc/fr/apt-get.fr.8.xml
@@ -201,7 +201,7 @@ semblables des sources tlchargs sous forme de tarball.
<listitem><para>
Avec la commande <literal>build-dep</literal>, apt-get installe ou supprime des paquets
dans le but de satisfaire les dpendances de construction d'un paquet source.
-Pour l'instant, dans la cas d'un paquet virtuel, un paquet est choisi au
+Pour l'instant, dans le cas d'un paquet virtuel, un paquet est choisi au
hasard.
</para></listitem>
</varlistentry>
diff --git a/methods/http.cc b/methods/http.cc
index 44274bd78..3f13be050 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -38,6 +38,7 @@
#include <stdio.h>
#include <errno.h>
#include <string.h>
+#include <iostream>
#include <map>
#include <apti18n.h>
diff --git a/po/ChangeLog b/po/ChangeLog
index 591f10b0a..8d5515e9d 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,43 @@
+2009-06-05 Jordi Mallach <jordi@debian.org>
+
+ * ca.po: Updated to 539t
+
+2009-06-04 Milo Casagrande <milo@ubuntu.com>
+
+ * it.po: Updated to 539t
+
+2009-06-01 Deng Xiyue <manphiz-guest@users.alioth.debian.org>
+
+ * zh_CN.po: Updated to 539t
+
+2009-05-21 Marcos <marcos.alvarez.costales@gmail.com>
+
+ * ast.po: Updated to 539t
+
+2009-04-28 Ivan Masár <helix84@centrum.sk>
+
+ * sk.po: Updated to 539t
+
+2009-04-23 Christian Perrier <bubulle@debian.org>
+
+ * Update all PO files and apt-all.pot. 545 strings.
+ Formerly complete PO files are now 539t1f6u
+ * fr.po: updated to 545t.
+
+2009-03-19 Ivan Masár <helix84@centrum.sk>
+
+ * sk.po: Updated to 539t
+
+2009-03-04 Daniel Nylander <po@danielnylander.se>
+
+ * sv.po: Updated to 539t
+
+2009-02-23 Christian Perrier <bubulle@debian.org>
+
+ * Update all PO files and apt-all.pot. 539 strings.
+ Formerly complete PO files are now 538t1u
+ * fr.po: updated to 539t.
+
2009-02-01 Hans Fredrik Nordhaug <hans@nordhaug.priv.no>
* nb.po: updated to 539t.
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 55f35cafa..9f826514b 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -1674,7 +1674,7 @@ msgid "Unable to accept connection"
msgstr ""
#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
-#: methods/http.cc:993
+#: methods/http.cc:994
msgid "Problem hashing file"
msgstr ""
@@ -1805,78 +1805,78 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:377 methods/http.cc:378
+#: methods/http.cc:377 methods/http.cc:379
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:523 methods/http.cc:524
+#: methods/http.cc:523 methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:531 methods/http.cc:532
+#: methods/http.cc:531 methods/http.cc:533
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:550 methods/http.cc:557 methods/http.cc:551
-#: methods/http.cc:558
+#: methods/http.cc:550 methods/http.cc:557 methods/http.cc:552
+#: methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:586 methods/http.cc:587
+#: methods/http.cc:586 methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:601 methods/http.cc:602
+#: methods/http.cc:601 methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:603 methods/http.cc:604
+#: methods/http.cc:603 methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:627 methods/http.cc:628
+#: methods/http.cc:627 methods/http.cc:629
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:774 methods/http.cc:781
+#: methods/http.cc:774 methods/http.cc:782
msgid "Select failed"
msgstr ""
-#: methods/http.cc:779 methods/http.cc:786
+#: methods/http.cc:779 methods/http.cc:787
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:802 methods/http.cc:809
+#: methods/http.cc:802 methods/http.cc:810
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:833 methods/http.cc:840
+#: methods/http.cc:833 methods/http.cc:841
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:861 methods/http.cc:868
+#: methods/http.cc:861 methods/http.cc:869
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:875 methods/http.cc:882
+#: methods/http.cc:875 methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:877 methods/http.cc:884
+#: methods/http.cc:877 methods/http.cc:885
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1104 methods/http.cc:1143
+#: methods/http.cc:1104 methods/http.cc:1144
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1121 methods/http.cc:1176 methods/http.cc:1160
-#: methods/http.cc:1215
+#: methods/http.cc:1121 methods/http.cc:1176 methods/http.cc:1161
+#: methods/http.cc:1216
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1228 methods/http.cc:1307
+#: methods/http.cc:1228 methods/http.cc:1308
msgid "Internal error"
msgstr ""
@@ -2673,7 +2673,7 @@ msgstr ""
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/http.cc:978 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:979 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr ""
@@ -2779,25 +2779,25 @@ msgid ""
"error"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/debsystem.cc:69
#, c-format
msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:73
+#: apt-pkg/deb/debsystem.cc:72
#, c-format
msgid "Unable to lock the administration directory (%s), are you root?"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:82
+#: apt-pkg/deb/debsystem.cc:81
msgid ""
"dpkg was interrupted, you must manually run 'sudo dpkg --configure -a' to "
"correct the problem. "
msgstr ""
-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:99
msgid "Not locked"
msgstr ""
diff --git a/po/ar.po b/po/ar.po
index afc52c7a8..4cc0cafc0 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: \n"
-"POT-Creation-Date: 2007-06-07 00:57+0200\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2006-10-20 21:28+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
@@ -31,8 +31,7 @@ msgid "Unable to locate package %s"
msgstr "تعذر العثور على الحزمة %s"
#: cmdline/apt-cache.cc:247
-#, fuzzy
-msgid "Total package names : "
+msgid "Total package names: "
msgstr "أسماء الحزم الكلية :"
#: cmdline/apt-cache.cc:287
@@ -61,7 +60,7 @@ msgstr "مجموع النسخ الفريدة:"
#: cmdline/apt-cache.cc:295
#, fuzzy
-msgid "Total Distinct Descriptions: "
+msgid "Total distinct descriptions: "
msgstr "مجموع النسخ الفريدة:"
#: cmdline/apt-cache.cc:297
@@ -161,10 +160,10 @@ msgid " %4i %s\n"
msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2564 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s لـ%s %s مُجمّع على %s %s\n"
#: cmdline/apt-cache.cc:1721
@@ -190,8 +189,8 @@ msgid ""
" show - Show a readable record for the package\n"
" depends - Show raw dependency information for a package\n"
" rdepends - Show reverse dependency information for a package\n"
-" pkgnames - List the names of all packages\n"
-" dotty - Generate package graphs for GraphVis\n"
+" pkgnames - List the names of all packages in the system\n"
+" dotty - Generate package graphs for GraphViz\n"
" xvcg - Generate package graphs for xvcg\n"
" policy - Show policy settings\n"
"\n"
@@ -257,8 +256,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
-#: apt-pkg/pkgcachegen.cc:827
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827
#, c-format
msgid "Unable to write to %s"
msgstr "تعذرت الكتابة إلى %s"
@@ -267,31 +265,31 @@ msgstr "تعذرت الكتابة إلى %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟"
-#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
+#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
msgid "Package extension list is too long"
msgstr "قائمة توسيعات الحزمة طويلة جداً"
-#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
-#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
-#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
+#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
+#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
+#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
#, c-format
msgid "Error processing directory %s"
msgstr "خطأ في معالجة الدليل %s"
-#: ftparchive/apt-ftparchive.cc:254
+#: ftparchive/apt-ftparchive.cc:251
msgid "Source extension list is too long"
msgstr "قائمة توسيعات المصدر طويلة جداً"
-#: ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:368
msgid "Error writing header to contents file"
msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:398
#, c-format
msgid "Error processing contents %s"
msgstr "خطأ في معالجة المحتويات %s"
-#: ftparchive/apt-ftparchive.cc:556
+#: ftparchive/apt-ftparchive.cc:553
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -333,303 +331,303 @@ msgid ""
" -o=? Set an arbitrary configuration option"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:762
+#: ftparchive/apt-ftparchive.cc:759
msgid "No selections matched"
msgstr "لم تُطابق أية تحديدات"
-#: ftparchive/apt-ftparchive.cc:835
+#: ftparchive/apt-ftparchive.cc:832
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'"
-#: ftparchive/cachedb.cc:47
+#: ftparchive/cachedb.cc:43
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "قاعدة البيانات كانت فاسدة، فتم تغيير اسمها إلى %s.old"
-#: ftparchive/cachedb.cc:65
+#: ftparchive/cachedb.cc:61
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "قاعدة البيانات قديمة، محاولة ترقية %s"
-#: ftparchive/cachedb.cc:76
+#: ftparchive/cachedb.cc:72
msgid ""
"DB format is invalid. If you upgraded from a older version of apt, please "
"remove and re-create the database."
msgstr ""
-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:77
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
+#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
+#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
#, c-format
msgid "Failed to stat %s"
msgstr ""
-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:238
msgid "Archive has no control record"
msgstr ""
-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:444
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:79
+#: ftparchive/writer.cc:76
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: تعذرت قراءة الدليل %s\n"
-#: ftparchive/writer.cc:84
+#: ftparchive/writer.cc:81
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:135
+#: ftparchive/writer.cc:132
msgid "E: "
msgstr "E: "
-#: ftparchive/writer.cc:137
+#: ftparchive/writer.cc:134
msgid "W: "
msgstr "W: "
-#: ftparchive/writer.cc:144
+#: ftparchive/writer.cc:141
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
+#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
#, c-format
msgid "Failed to resolve %s"
msgstr ""
-#: ftparchive/writer.cc:173
+#: ftparchive/writer.cc:170
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:198
+#: ftparchive/writer.cc:195
#, c-format
msgid "Failed to open %s"
msgstr "فشل فتح %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:254
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:262
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:266
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:276
+#: ftparchive/writer.cc:273
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** فشل ربط %s بـ%s"
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:283
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
-#: ftparchive/writer.cc:390
+#: ftparchive/writer.cc:387
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
+#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:623
+#: ftparchive/writer.cc:620
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:627
+#: ftparchive/writer.cc:624
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
-#: ftparchive/contents.cc:317
+#: ftparchive/contents.cc:321
#, c-format
msgid "Internal error, could not locate member %s"
msgstr "خطأ داخلي، تعذر العثور على العضو %s"
-#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
+#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
msgid "realloc - Failed to allocate memory"
msgstr "realloc - فشل تعيين الذاكرة"
-#: ftparchive/override.cc:38 ftparchive/override.cc:146
+#: ftparchive/override.cc:34 ftparchive/override.cc:142
#, c-format
msgid "Unable to open %s"
msgstr "تعذر فتح %s"
-#: ftparchive/override.cc:64 ftparchive/override.cc:170
+#: ftparchive/override.cc:60 ftparchive/override.cc:166
#, c-format
msgid "Malformed override %s line %lu #1"
msgstr ""
-#: ftparchive/override.cc:78 ftparchive/override.cc:182
+#: ftparchive/override.cc:74 ftparchive/override.cc:178
#, c-format
msgid "Malformed override %s line %lu #2"
msgstr ""
-#: ftparchive/override.cc:92 ftparchive/override.cc:195
+#: ftparchive/override.cc:88 ftparchive/override.cc:191
#, c-format
msgid "Malformed override %s line %lu #3"
msgstr ""
-#: ftparchive/override.cc:131 ftparchive/override.cc:205
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
#, c-format
msgid "Failed to read the override file %s"
msgstr ""
-#: ftparchive/multicompress.cc:75
+#: ftparchive/multicompress.cc:72
#, c-format
msgid "Unknown compression algorithm '%s'"
msgstr ""
-#: ftparchive/multicompress.cc:105
+#: ftparchive/multicompress.cc:102
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr ""
-#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
msgid "Failed to create IPC pipe to subprocess"
msgstr ""
-#: ftparchive/multicompress.cc:198
+#: ftparchive/multicompress.cc:195
msgid "Failed to create FILE*"
msgstr ""
-#: ftparchive/multicompress.cc:201
+#: ftparchive/multicompress.cc:198
msgid "Failed to fork"
msgstr ""
-#: ftparchive/multicompress.cc:215
+#: ftparchive/multicompress.cc:212
msgid "Compress child"
msgstr ""
-#: ftparchive/multicompress.cc:238
+#: ftparchive/multicompress.cc:235
#, c-format
msgid "Internal error, failed to create %s"
msgstr "خطأ داخلي، تعذر إنشاء %s"
-#: ftparchive/multicompress.cc:289
+#: ftparchive/multicompress.cc:286
msgid "Failed to create subprocess IPC"
msgstr ""
-#: ftparchive/multicompress.cc:324
+#: ftparchive/multicompress.cc:321
msgid "Failed to exec compressor "
msgstr ""
-#: ftparchive/multicompress.cc:363
+#: ftparchive/multicompress.cc:360
msgid "decompressor"
msgstr ""
-#: ftparchive/multicompress.cc:406
+#: ftparchive/multicompress.cc:403
msgid "IO to subprocess/file failed"
msgstr ""
-#: ftparchive/multicompress.cc:458
+#: ftparchive/multicompress.cc:455
msgid "Failed to read while computing MD5"
msgstr ""
-#: ftparchive/multicompress.cc:475
+#: ftparchive/multicompress.cc:472
#, c-format
msgid "Problem unlinking %s"
msgstr ""
-#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
#, c-format
msgid "Failed to rename %s to %s"
msgstr "فشل تغيير اسم %s إلى %s"
-#: cmdline/apt-get.cc:121
+#: cmdline/apt-get.cc:124
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
-#: cmdline/apt-get.cc:238
+#: cmdline/apt-get.cc:241
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: cmdline/apt-get.cc:328
+#: cmdline/apt-get.cc:331
#, c-format
msgid "but %s is installed"
msgstr "إلا أن %s مثبت"
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:333
#, c-format
msgid "but %s is to be installed"
msgstr "إلا أنه سيتم تثبيت %s"
-#: cmdline/apt-get.cc:337
+#: cmdline/apt-get.cc:340
msgid "but it is not installable"
msgstr "إلا أنه غير قابل للتثبيت"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
msgid "but it is a virtual package"
msgstr "إلا أنها حزمة وهمية"
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
msgid "but it is not installed"
msgstr "إلا أنها غير مثبتة"
-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345
msgid "but it is not going to be installed"
msgstr "إلا أنه لن يتم تثبيتها"
-#: cmdline/apt-get.cc:347
+#: cmdline/apt-get.cc:350
msgid " or"
msgstr " أو"
-#: cmdline/apt-get.cc:376
+#: cmdline/apt-get.cc:379
msgid "The following NEW packages will be installed:"
msgstr "سيتم تثبيت الحزم الجديدة التالية:"
-#: cmdline/apt-get.cc:402
+#: cmdline/apt-get.cc:405
msgid "The following packages will be REMOVED:"
msgstr "سيتم إزالة الحزم التالية:"
-#: cmdline/apt-get.cc:424
+#: cmdline/apt-get.cc:427
msgid "The following packages have been kept back:"
msgstr "سيتم الإبقاء على الحزم التالية:"
-#: cmdline/apt-get.cc:445
+#: cmdline/apt-get.cc:448
msgid "The following packages will be upgraded:"
msgstr "ستتم ترقية الحزم التالية:"
-#: cmdline/apt-get.cc:466
+#: cmdline/apt-get.cc:469
msgid "The following packages will be DOWNGRADED:"
msgstr "سيتم تثبيط الحزم التالية:"
-#: cmdline/apt-get.cc:486
+#: cmdline/apt-get.cc:489
msgid "The following held packages will be changed:"
msgstr "سيتم تغيير الحزم المبقاة التالية:"
-#: cmdline/apt-get.cc:539
+#: cmdline/apt-get.cc:542
#, c-format
msgid "%s (due to %s) "
msgstr "%s (بسبب %s) "
-#: cmdline/apt-get.cc:547
+#: cmdline/apt-get.cc:550
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
@@ -637,143 +635,143 @@ msgstr ""
"تحذير: ستتم إزالة الحزم الأساسية التالية.\n"
"لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!"
-#: cmdline/apt-get.cc:578
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، "
-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:585
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu أعيد تثبيتها، "
-#: cmdline/apt-get.cc:584
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu downgraded, "
msgstr "%lu مثبطة، "
-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:589
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
-#: cmdline/apt-get.cc:590
+#: cmdline/apt-get.cc:593
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:667
msgid "Correcting dependencies..."
msgstr "تصحيح المعتمدات..."
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670
msgid " failed."
msgstr " فشل."
-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673
msgid "Unable to correct dependencies"
msgstr "لم يمكن تصحيح المعتمدات"
-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676
msgid "Unable to minimize the upgrade set"
msgstr "لم يمكن تقليص مجموعة الترقية"
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:678
msgid " Done"
msgstr " تم"
-#: cmdline/apt-get.cc:679
+#: cmdline/apt-get.cc:682
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "قد ترغب بتنفيذ الأمر `apt-get -f install' لتصحيح هذه."
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685
msgid "Unmet dependencies. Try using -f."
msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f."
-#: cmdline/apt-get.cc:704
+#: cmdline/apt-get.cc:707
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "تحذير: تعذرت المصادقة على الحزم التالية!"
-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:711
msgid "Authentication warning overridden.\n"
msgstr "تم غض النظر عن تحذير المصادقة.\n"
-#: cmdline/apt-get.cc:715
+#: cmdline/apt-get.cc:718
msgid "Install these packages without verification [y/N]? "
msgstr "تثبيت هذه الحزم دون التحقق منها [y/N]؟ "
-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:720
msgid "Some packages could not be authenticated"
msgstr "تعذرت المصادقة على بعض الحزم"
-#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
+#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
msgid "There are problems and -y was used without --force-yes"
msgstr "هناك مشاكل وتم استخدام -y دون --force-yes"
-#: cmdline/apt-get.cc:770
+#: cmdline/apt-get.cc:773
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!"
-#: cmdline/apt-get.cc:779
+#: cmdline/apt-get.cc:782
msgid "Packages need to be removed but remove is disabled."
msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة."
-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:793
msgid "Internal error, Ordering didn't finish"
msgstr "خطأ داخلي، لم تنته عملية الترتيب"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1995 cmdline/apt-get.cc:2028
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "تعذر قَفْل دليل التنزيل"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2076 cmdline/apt-get.cc:2312
-#: apt-pkg/cachefile.cc:63 apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
+#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "تعذرت قراءة قائمة المصادر."
-#: cmdline/apt-get.cc:831
+#: cmdline/apt-get.cc:834
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr "يا للغرابة.. لم تتطابق الأحجام، الرجاء مراسلة apt@packages.debian.org"
-#: cmdline/apt-get.cc:836
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "بحاجة إلى جلب %sب/%sب من الأرشيف.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "بحاجة إلى جلب %sب من الأرشيف.\n"
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:847
#, fuzzy, c-format
-msgid "After unpacking %sB of additional disk space will be used.\n"
+msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "بعد الاستخراج %sب من المساحة الإضافيّة سيتمّ استخدامها.\n"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850
#, fuzzy, c-format
-msgid "After unpacking %sB disk space will be freed.\n"
+msgid "After this operation, %sB disk space will be freed.\n"
msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2166
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "تعذر حساب المساحة الحرة في %s"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:871
#, c-format
msgid "You don't have enough free space in %s."
msgstr "ليس هناك مساحة كافية في %s."
-#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
+#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:889
msgid "Yes, do as I say!"
msgstr "نعم، افعل ما أقوله!"
-#: cmdline/apt-get.cc:883
+#: cmdline/apt-get.cc:891
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -784,29 +782,28 @@ msgstr ""
"كي تستمر اكتب العبارة '%s'\n"
" ؟] "
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
msgid "Abort."
msgstr "إجهاض."
-#: cmdline/apt-get.cc:904
+#: cmdline/apt-get.cc:912
msgid "Do you want to continue [Y/n]? "
msgstr "هل تريد الاستمرار [Y/n]؟"
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2209
-#: apt-pkg/algorithms.cc:1348
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "فشل إحضار %s %s\n"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:1002
msgid "Some files failed to download"
msgstr "فشل تنزيل بعض الملفات"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2218
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "اكتمل التنزيل وفي وضع التنزيل فقط"
-#: cmdline/apt-get.cc:1001
+#: cmdline/apt-get.cc:1009
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -814,47 +811,47 @@ msgstr ""
"تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --"
"fix-missing؟"
-#: cmdline/apt-get.cc:1005
+#: cmdline/apt-get.cc:1013
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً"
-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1018
msgid "Unable to correct missing packages."
msgstr "تعذر تصحيح الحزم المفقودة."
-#: cmdline/apt-get.cc:1011
+#: cmdline/apt-get.cc:1019
msgid "Aborting install."
msgstr "إجهاض التثبيت."
-#: cmdline/apt-get.cc:1045
+#: cmdline/apt-get.cc:1053
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "لاحظ، تحديد %s بدلاً من %s\n"
-#: cmdline/apt-get.cc:1055
+#: cmdline/apt-get.cc:1063
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
-#: cmdline/apt-get.cc:1073
+#: cmdline/apt-get.cc:1081
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1092
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "الحزمة %s وهميّة وتوفّرها:\n"
-#: cmdline/apt-get.cc:1096
+#: cmdline/apt-get.cc:1104
msgid " [Installed]"
msgstr " [مُثبّتة]"
-#: cmdline/apt-get.cc:1101
+#: cmdline/apt-get.cc:1109
msgid "You should explicitly select one to install."
msgstr "يجب اختيار واحدة بالتحديد لتثبيتها."
-#: cmdline/apt-get.cc:1106
+#: cmdline/apt-get.cc:1114
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -862,121 +859,129 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:1125
+#: cmdline/apt-get.cc:1133
msgid "However the following packages replace it:"
msgstr "على أيّ فإن الحزم التالية تحلّ مكانها:"
-#: cmdline/apt-get.cc:1128
+#: cmdline/apt-get.cc:1136
#, c-format
msgid "Package %s has no installation candidate"
msgstr "الحزمة %s ليس لها مرشح تثبيت"
-#: cmdline/apt-get.cc:1148
+#: cmdline/apt-get.cc:1156
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "إعادة تثبيت %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n"
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s هي النسخة الأحدث.\n"
-#: cmdline/apt-get.cc:1185
+#: cmdline/apt-get.cc:1193
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'"
-#: cmdline/apt-get.cc:1187
+#: cmdline/apt-get.cc:1195
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1201
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
-#: cmdline/apt-get.cc:1330
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "لا يقبل الأمر update أية مُعطيات"
-#: cmdline/apt-get.cc:1343
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "تعذر قفل دليل القائمة"
-#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 apt-pkg/algorithms.cc:1374
-#: apt-pkg/algorithms.cc:1376
-msgid ""
-"Some index files failed to download, they have been ignored, or old ones "
-"used instead."
-msgstr ""
-
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1465
+#: cmdline/apt-get.cc:1442
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "سيتم تثبيت الحزم الجديدة التالية:"
-#: cmdline/apt-get.cc:1467
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1472
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1736
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << endl;
+#. }
+#.
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "قد تساعد المعلومات التالية في حل المشكلة:"
-#: cmdline/apt-get.cc:1479
+#: cmdline/apt-get.cc:1456
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
-#: cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1530
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "تعذر العثور على الحزمة %s"
-#: cmdline/apt-get.cc:1642 cmdline/apt-get.cc:1678
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "تعذر العثور على الحزمة %s"
-#: cmdline/apt-get.cc:1665
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n"
-#: cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:1699
#, fuzzy, c-format
-msgid "%s set to manual installed.\n"
+msgid "%s set to manually installed.\n"
msgstr "إلا أنه سيتم تثبيت %s"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "قد ترغب بتشغيل `apt-get -f install' لتصحيح هذه:"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
"مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)."
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -984,160 +989,152 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1731
-msgid ""
-"Since you only requested a single operation it is extremely likely that\n"
-"the package is simply not installable and a bug report against\n"
-"that package should be filed."
-msgstr ""
-
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "حزم معطوبة"
-#: cmdline/apt-get.cc:1770
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "سيتم تثبيت الحزم الإضافيّة التالية:"
-#: cmdline/apt-get.cc:1859
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "الحزم المقترحة:"
-#: cmdline/apt-get.cc:1860
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "الحزم المستحسنة:"
-#: cmdline/apt-get.cc:1888
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "حساب الترقية..."
-#: cmdline/apt-get.cc:1891 methods/ftp.cc:702 methods/connect.cc:101
-#: methods/connect.cc:111
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "فشل"
-#: cmdline/apt-get.cc:1896
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "تمّ"
-#: cmdline/apt-get.cc:1963 cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2071
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
-#: cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "تعذر العثور على مصدر الحزمة %s"
-#: cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "تخطي الملف '%s' المنزل مسبقاً\n"
-#: cmdline/apt-get.cc:2169
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "ليس هناك مساحة كافية في %s"
-#: cmdline/apt-get.cc:2174
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n"
-#: cmdline/apt-get.cc:2177
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n"
-#: cmdline/apt-get.cc:2183
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "إحضار المصدر %s\n"
-#: cmdline/apt-get.cc:2214
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "فشل إحضار بعض الأرشيفات."
-#: cmdline/apt-get.cc:2242
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "أمر فك الحزمة '%s' فشل.\n"
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2272
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "أمر البناء '%s' فشل.\n"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2307
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2407
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2459
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2519
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2537
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2569
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "الوحدات المدعومة:"
-#: cmdline/apt-get.cc:2610
+#: cmdline/apt-get.cc:2628
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1152,6 +1149,8 @@ msgid ""
" upgrade - Perform an upgrade\n"
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
+" autoremove - Remove automatically all unused packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1167,7 +1166,7 @@ msgid ""
" -d Download only - do NOT install or unpack archives\n"
" -s No-act. Perform ordering simulation\n"
" -y Assume Yes to all queries and do not prompt\n"
-" -f Attempt to continue if the integrity check fails\n"
+" -f Attempt to correct a system with broken dependencies in place\n"
" -m Attempt to continue if archives are unlocatable\n"
" -u Show a list of upgraded packages as well\n"
" -b Build the source package after fetching it\n"
@@ -1238,24 +1237,28 @@ msgstr ""
msgid "Bad default setting!"
msgstr "إعداد افتراضيّ سيّء!"
-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
-#: dselect/install:104 dselect/update:45
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
+#: dselect/install:105 dselect/update:45
msgid "Press enter to continue."
msgstr "اضغط مفتاح الإدخال للاستمرار."
-#: dselect/install:100
+#: dselect/install:91
+msgid "Do you want to erase any previously downloaded .deb files?"
+msgstr ""
+
+#: dselect/install:101
msgid "Some errors occurred while unpacking. I'm going to configure the"
msgstr "حدثت بعض الأخطاء أثناء فك الحزمة. سأقوم بتهيئة "
-#: dselect/install:101
+#: dselect/install:102
msgid "packages that were installed. This may result in duplicate errors"
msgstr "الحزم التي تم تثبيتها. قد يتسبب هذا بظهر أخطاء متكررة"
-#: dselect/install:102
+#: dselect/install:103
msgid "or errors caused by missing dependencies. This is OK, only the errors"
msgstr "أو أخطاء سبّبتها المُعتمدات المفقودة. لا بأس بهذا، فقط الأخطاء"
-#: dselect/install:103
+#: dselect/install:104
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها وتشغيل التثبيت مجدداً"
@@ -1264,192 +1267,188 @@ msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها
msgid "Merging available information"
msgstr "دمج المعلومات المتوفرة"
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:114
msgid "Failed to create pipes"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:141
msgid "Failed to exec gzip "
msgstr "فشل تنفيذ gzip"
-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
+#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
msgid "Corrupted archive"
msgstr "أرشيف فاسد"
-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:193
msgid "Tar checksum failed, archive corrupted"
msgstr "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد"
-#: apt-inst/contrib/extracttar.cc:299
+#: apt-inst/contrib/extracttar.cc:296
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr ""
-#: apt-inst/contrib/arfile.cc:73
+#: apt-inst/contrib/arfile.cc:70
msgid "Invalid archive signature"
msgstr "توقيع الأرشيف غير صالح"
-#: apt-inst/contrib/arfile.cc:81
+#: apt-inst/contrib/arfile.cc:78
msgid "Error reading archive member header"
msgstr ""
-#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
+#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
msgstr ""
-#: apt-inst/contrib/arfile.cc:131
+#: apt-inst/contrib/arfile.cc:128
msgid "Archive is too short"
msgstr "الأرشيف قصير جداً"
-#: apt-inst/contrib/arfile.cc:135
+#: apt-inst/contrib/arfile.cc:132
msgid "Failed to read the archive headers"
msgstr "فشلت قراءة ترويسات الأرشيف"
-#: apt-inst/filelist.cc:384
+#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr ""
-#: apt-inst/filelist.cc:416
+#: apt-inst/filelist.cc:412
msgid "Failed to locate the hash element!"
msgstr ""
-#: apt-inst/filelist.cc:463
+#: apt-inst/filelist.cc:459
msgid "Failed to allocate diversion"
msgstr ""
-#: apt-inst/filelist.cc:468
+#: apt-inst/filelist.cc:464
msgid "Internal error in AddDiversion"
msgstr "خطأ داخلي في AddDiversion"
-#: apt-inst/filelist.cc:481
+#: apt-inst/filelist.cc:477
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
msgstr ""
-#: apt-inst/filelist.cc:510
+#: apt-inst/filelist.cc:506
#, c-format
msgid "Double add of diversion %s -> %s"
msgstr ""
-#: apt-inst/filelist.cc:553
+#: apt-inst/filelist.cc:549
#, c-format
msgid "Duplicate conf file %s/%s"
msgstr "ملف تهيئة مُزدوج %s/%s"
-#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
#, c-format
msgid "Failed to write file %s"
msgstr "فشلت كتابة الملف %s"
-#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
+#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
#, c-format
msgid "Failed to close file %s"
msgstr "فشل إغلاق الملف %s"
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
#, c-format
msgid "The path %s is too long"
msgstr "المسار %s طويل جداً"
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:124
#, c-format
msgid "Unpacking %s more than once"
msgstr "فكّ تحزيم %s أكثر من مرّة"
-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:134
#, c-format
msgid "The directory %s is diverted"
msgstr ""
-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:144
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr ""
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
msgid "The diversion path is too long"
msgstr ""
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:240
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr ""
-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:280
msgid "Failed to locate node in its hash bucket"
msgstr ""
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:284
msgid "The path is too long"
msgstr "المسار طويل جداً"
-#: apt-inst/extract.cc:417
+#: apt-inst/extract.cc:414
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr ""
-#: apt-inst/extract.cc:434
+#: apt-inst/extract.cc:431
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
-#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:753
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
-#: apt-pkg/contrib/configuration.cc:821 apt-pkg/acquire.cc:419
-#: methods/mirror.cc:85
#, c-format
msgid "Unable to read %s"
msgstr "تعذرت قراءة %s"
-#: apt-inst/extract.cc:494
+#: apt-inst/extract.cc:491
#, c-format
msgid "Unable to stat %s"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
+#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
#, c-format
msgid "Failed to remove %s"
msgstr "تعذرت إزالة %s"
-#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
+#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
#, c-format
msgid "Unable to create %s"
msgstr "تعذر إنشاء %s"
-#: apt-inst/deb/dpkgdb.cc:118
+#: apt-inst/deb/dpkgdb.cc:114
#, c-format
msgid "Failed to stat %sinfo"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:123
+#: apt-inst/deb/dpkgdb.cc:119
msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:748
-#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
-#: apt-pkg/pkgcachegen.cc:945 apt-pkg/pkgcachegen.cc:760
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:760
#: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834
#: apt-pkg/pkgcachegen.cc:957
msgid "Reading package lists"
msgstr "قراءة قوائم الحزم"
-#: apt-inst/deb/dpkgdb.cc:180
+#: apt-inst/deb/dpkgdb.cc:176
#, c-format
msgid "Failed to change to the admin dir %sinfo"
msgstr "فشل تغيير دليل الإدارة إلى %sinfo"
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
-#: apt-inst/deb/dpkgdb.cc:448
+#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
+#: apt-inst/deb/dpkgdb.cc:444
msgid "Internal error getting a package name"
msgstr "خطأ داخلي أثناء الحصول على اسم الحزمة"
-#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
msgid "Reading file listing"
msgstr "قراءة سرد الملفات"
-#: apt-inst/deb/dpkgdb.cc:216
+#: apt-inst/deb/dpkgdb.cc:212
#, c-format
msgid ""
"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1457,77 +1456,77 @@ msgid ""
"package!"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
+#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
#, c-format
msgid "Failed reading the list file %sinfo/%s"
msgstr "فشلت قراءة ملف القائمة %sinfo/%s"
-#: apt-inst/deb/dpkgdb.cc:266
+#: apt-inst/deb/dpkgdb.cc:262
msgid "Internal error getting a node"
msgstr "خطأ داخلي أثناء الحصول على node"
-#: apt-inst/deb/dpkgdb.cc:309
+#: apt-inst/deb/dpkgdb.cc:305
#, c-format
msgid "Failed to open the diversions file %sdiversions"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:324
+#: apt-inst/deb/dpkgdb.cc:320
msgid "The diversion file is corrupted"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
-#: apt-inst/deb/dpkgdb.cc:341
+#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
+#: apt-inst/deb/dpkgdb.cc:337
#, c-format
msgid "Invalid line in the diversion file: %s"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:362
+#: apt-inst/deb/dpkgdb.cc:358
msgid "Internal error adding a diversion"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:383
+#: apt-inst/deb/dpkgdb.cc:379
msgid "The pkg cache must be initialized first"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:443
+#: apt-inst/deb/dpkgdb.cc:439
#, c-format
msgid "Failed to find a Package: header, offset %lu"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:465
+#: apt-inst/deb/dpkgdb.cc:461
#, c-format
msgid "Bad ConfFile section in the status file. Offset %lu"
msgstr ""
-#: apt-inst/deb/dpkgdb.cc:470
+#: apt-inst/deb/dpkgdb.cc:466
#, c-format
msgid "Error parsing MD5. Offset %lu"
msgstr ""
-#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr ""
-#: apt-inst/deb/debfile.cc:52
+#: apt-inst/deb/debfile.cc:50
#, c-format
-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr ""
-#: apt-inst/deb/debfile.cc:112
+#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
msgstr "تعذر التغيير إلى %s"
-#: apt-inst/deb/debfile.cc:138
+#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
msgstr "خطأ داخلي، تعذر العثور على العضو"
-#: apt-inst/deb/debfile.cc:171
+#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
msgstr "فشل العثور على ملف تحكّم صالح"
-#: apt-inst/deb/debfile.cc:256
+#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
msgstr ""
@@ -1628,8 +1627,7 @@ msgstr "انتهى وقت الاتصال"
msgid "Server closed the connection"
msgstr "أغلق الخادم الاتصال"
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
-#: apt-pkg/contrib/fileutl.cc:538
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
msgid "Read error"
msgstr "خطأ في القراءة"
@@ -1641,8 +1639,7 @@ msgstr ""
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
-#: apt-pkg/contrib/fileutl.cc:577
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
msgid "Write error"
msgstr "خطأ في الكتابة"
@@ -1696,8 +1693,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr "تعذر قبول الاتصال"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
-#: methods/http.cc:993
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1724,95 +1720,95 @@ msgstr "استعلام"
msgid "Unable to invoke "
msgstr ""
-#: methods/connect.cc:64 methods/connect.cc:71
+#: methods/connect.cc:70
#, c-format
msgid "Connecting to %s (%s)"
msgstr "الاتصال بـ%s (%s)"
-#: methods/connect.cc:71 methods/connect.cc:82
+#: methods/connect.cc:81
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80 methods/connect.cc:89
+#: methods/connect.cc:90
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
msgstr ""
-#: methods/connect.cc:86 methods/connect.cc:95
+#: methods/connect.cc:96
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "تعذر تمهيد الاتصال بـ%s:%s (%s)."
-#: methods/connect.cc:93 methods/connect.cc:103
+#: methods/connect.cc:104
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "تعذر الاتصال بـ%s:%s (%s)، انتهى وقت الاتصال"
-#: methods/connect.cc:108 methods/connect.cc:118
+#: methods/connect.cc:119
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "تعذر الاتصال بـ%s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425 methods/connect.cc:146
+#: methods/connect.cc:147 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "الاتصال بـ%s"
-#: methods/connect.cc:167 methods/connect.cc:164 methods/connect.cc:183
+#: methods/connect.cc:165 methods/connect.cc:184
#, c-format
msgid "Could not resolve '%s'"
msgstr ""
-#: methods/connect.cc:173 methods/connect.cc:189
+#: methods/connect.cc:190
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr ""
-#: methods/connect.cc:176 methods/connect.cc:192
+#: methods/connect.cc:193
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr ""
-#: methods/connect.cc:223 methods/connect.cc:239
+#: methods/connect.cc:240
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "تعذر الاتصال بـ%s %s:"
-#: methods/gpgv.cc:65 methods/gpgv.cc:71
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr ""
-#: methods/gpgv.cc:101 methods/gpgv.cc:107
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:205 methods/gpgv.cc:223
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:210 methods/gpgv.cc:228
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
-msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:219 methods/gpgv.cc:237
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:250 methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr ""
-#: methods/gpgv.cc:257 methods/gpgv.cc:285
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1828,78 +1824,81 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:377 methods/http.cc:378
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "بانتظار الترويسات"
-#: methods/http.cc:523 methods/http.cc:524
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:531 methods/http.cc:532
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "سطر ترويسة سيء"
-#: methods/http.cc:550 methods/http.cc:557 methods/http.cc:551
-#: methods/http.cc:558
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "أرسل خادم http ترويسة ردّ غير صالحة"
-#: methods/http.cc:586 methods/http.cc:587
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "أرسل خادم http ترويسة طول محتويات (ِContent-Length) غير صالحة"
-#: methods/http.cc:601 methods/http.cc:602
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "أرسل خادم http ترويسة مدى محتويات (ِContent-Range) غير صالحة"
-#: methods/http.cc:603 methods/http.cc:604
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "خادم http له دعم مدى معطوب"
-#: methods/http.cc:627 methods/http.cc:628
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "نسق تاريخ مجهول"
-#: methods/http.cc:774 methods/http.cc:781
+#: methods/http.cc:782
msgid "Select failed"
msgstr "فشل التحديد"
-#: methods/http.cc:779 methods/http.cc:786
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "انتهى وقت الاتصال"
-#: methods/http.cc:802 methods/http.cc:809
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "خطأ في الكتابة إلى ملف المُخرجات"
-#: methods/http.cc:833 methods/http.cc:840
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "خطأ في الكتابة إلى الملف"
-#: methods/http.cc:861 methods/http.cc:868
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "خطأ في الكتابة إلى الملف"
-#: methods/http.cc:875 methods/http.cc:882
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال"
-#: methods/http.cc:877 methods/http.cc:884
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "خطأ في القراءة من الخادم"
-#: methods/http.cc:1104 methods/http.cc:1143
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "فشلت كتابة الملف %s"
+
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "بيانات ترويسة سيئة"
-#: methods/http.cc:1121 methods/http.cc:1176 methods/http.cc:1160
-#: methods/http.cc:1215
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "فشل الاتصال"
-#: methods/http.cc:1228 methods/http.cc:1307
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "خطأ داخلي"
@@ -1912,7 +1911,38 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:978 apt-pkg/contrib/strutl.cc:1018
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "تعذر العثور على التحديد %s"
@@ -1927,48 +1957,42 @@ msgstr "اختصار نوع مجهول: '%c'"
msgid "Opening configuration file %s"
msgstr "فتح ملف التهيئة %s"
-#: apt-pkg/contrib/configuration.cc:515
-#, fuzzy, c-format
-msgid "Line %d too long (max %u)"
-msgstr "السطر %d طويل جداً (أقصاه %d)"
-
-#: apt-pkg/contrib/configuration.cc:611 apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:662
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
-#: apt-pkg/contrib/configuration.cc:630 apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:681
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:647 apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:687 apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:738
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:694 apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:745
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:698 apt-pkg/contrib/configuration.cc:703
#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:707 apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:758
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:741 apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:809
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
@@ -2034,81 +2058,80 @@ msgstr "عمليّة غير صالحة %s"
msgid "Unable to stat the mount point %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
-#: apt-pkg/contrib/cdromutl.cc:180 apt-pkg/acquire.cc:425
-#: apt-pkg/acquire.cc:450 methods/mirror.cc:91
+#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
+#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
#, c-format
msgid "Unable to change to %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:187 apt-pkg/contrib/cdromutl.cc:188
+#: apt-pkg/contrib/cdromutl.cc:188
msgid "Failed to stat the cdrom"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:82 apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:149
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:87 apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:154
#, c-format
msgid "Could not open lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:105 apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:172
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:109 apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:176
#, c-format
msgid "Could not get lock %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:377 apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:444
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:387 apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:454
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:390 apt-pkg/contrib/fileutl.cc:457
+#: apt-pkg/contrib/fileutl.cc:457
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:459
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:436 apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:503
#, c-format
msgid "Could not open file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:492 apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:559
#, c-format
msgid "read, still have %lu to read but none left"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:522 apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:589
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:597 apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:664
msgid "Problem closing the file"
msgstr "مشكلة في إغلاق الملف"
-#: apt-pkg/contrib/fileutl.cc:603 apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:670
msgid "Problem unlinking the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:614 apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:681
msgid "Problem syncing the file"
msgstr "مشكلة في مزامنة الملف"
@@ -2285,40 +2308,46 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr ""
-#: apt-pkg/algorithms.cc:247 apt-pkg/algorithms.cc:248
+#: apt-pkg/algorithms.cc:248
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1105 apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1107
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1107 apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1109
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/acquire.cc:59 apt-pkg/acquire.cc:60
+#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+msgid ""
+"Some index files failed to download, they have been ignored, or old ones "
+"used instead."
+msgstr ""
+
+#: apt-pkg/acquire.cc:59
#, c-format
msgid "Lists directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:63 apt-pkg/acquire.cc:64
+#: apt-pkg/acquire.cc:63
#, c-format
msgid "Archive directory %spartial is missing."
msgstr ""
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:827 apt-pkg/acquire.cc:829
+#: apt-pkg/acquire.cc:828
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:829 apt-pkg/acquire.cc:831
+#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li"
msgstr ""
@@ -2333,17 +2362,17 @@ msgstr ""
msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/acquire-worker.cc:398 apt-pkg/acquire-worker.cc:413
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "الرجاء إدخال القرص المُسمّى '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."
-#: apt-pkg/init.cc:124 apt-pkg/init.cc:125
+#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "نظام الحزم '%s' غير مدعوم"
-#: apt-pkg/init.cc:140 apt-pkg/init.cc:141
+#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2356,11 +2385,11 @@ msgstr ""
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
-#: apt-pkg/cachefile.cc:69 apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:71
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
-#: apt-pkg/cachefile.cc:73 apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:75
msgid "You may want to run apt-get update to correct these problems"
msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل"
@@ -2391,126 +2420,124 @@ msgstr "حدث خطأ أثناء معالجة %s (NewPackage)"
msgid "Error occurred while processing %s (UsePackage1)"
msgstr "حدث خطأ أثناء معالجة %s (UserPackage1)"
-#: apt-pkg/pkgcachegen.cc:153 apt-pkg/pkgcachegen.cc:164
+#: apt-pkg/pkgcachegen.cc:164
#, fuzzy, c-format
msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:178 apt-pkg/pkgcachegen.cc:189
+#: apt-pkg/pkgcachegen.cc:189
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr "حدث خطأ أثناء معالجة %s (UserPackage2)"
-#: apt-pkg/pkgcachegen.cc:182 apt-pkg/pkgcachegen.cc:193
+#: apt-pkg/pkgcachegen.cc:193
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:213 apt-pkg/pkgcachegen.cc:224
+#: apt-pkg/pkgcachegen.cc:224
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)"
-#: apt-pkg/pkgcachegen.cc:217 apt-pkg/pkgcachegen.cc:228
+#: apt-pkg/pkgcachegen.cc:228
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr "حدث خطأ أثناء معالجة %s (UsePackage3)"
-#: apt-pkg/pkgcachegen.cc:221 apt-pkg/pkgcachegen.cc:232
+#: apt-pkg/pkgcachegen.cc:232
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr "حدث خطأ أثناء معالجة %s (NewVersion2)"
-#: apt-pkg/pkgcachegen.cc:245 apt-pkg/pkgcachegen.cc:256
+#: apt-pkg/pkgcachegen.cc:256
#, fuzzy, c-format
msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
-#: apt-pkg/pkgcachegen.cc:251 apt-pkg/pkgcachegen.cc:262
+#: apt-pkg/pkgcachegen.cc:262
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:254 apt-pkg/pkgcachegen.cc:265
+#: apt-pkg/pkgcachegen.cc:265
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:257 apt-pkg/pkgcachegen.cc:268
+#: apt-pkg/pkgcachegen.cc:268
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:260 apt-pkg/pkgcachegen.cc:271
+#: apt-pkg/pkgcachegen.cc:271
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:288 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:299
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:301 apt-pkg/pkgcachegen.cc:312
+#: apt-pkg/pkgcachegen.cc:312
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:307 apt-pkg/pkgcachegen.cc:318
+#: apt-pkg/pkgcachegen.cc:318
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:678 apt-pkg/pkgcachegen.cc:690
+#: apt-pkg/pkgcachegen.cc:690
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:763 apt-pkg/pkgcachegen.cc:775
+#: apt-pkg/pkgcachegen.cc:775
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909
msgid "IO Error saving source cache"
msgstr ""
-#: apt-pkg/acquire-item.cc:127 apt-pkg/acquire-item.cc:134
+#: apt-pkg/acquire-item.cc:127
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "فشل إعادة التسمية ، %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:401 apt-pkg/acquire-item.cc:451
+#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
msgstr "MD5Sum غير متطابقة"
-#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408
-#: apt-pkg/acquire-item.cc:707 apt-pkg/acquire-item.cc:1478
+#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum غير متطابقة"
-#: apt-pkg/acquire-item.cc:1100 apt-pkg/acquire-item.cc:1170
+#: apt-pkg/acquire-item.cc:1118
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1213 apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1231
#, 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:1272 apt-pkg/acquire-item.cc:1342
+#: apt-pkg/acquire-item.cc:1290
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:1313 apt-pkg/acquire-item.cc:1383
+#: apt-pkg/acquire-item.cc:1331
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:1400 apt-pkg/acquire-item.cc:1470
+#: apt-pkg/acquire-item.cc:1418
msgid "Size mismatch"
msgstr "الحجم غير متطابق"
@@ -2565,8 +2592,8 @@ msgstr ""
#: apt-pkg/cdrom.cc:678
#, c-format
msgid ""
-"Found %u package indexes, %u source indexes, %u translation indexes and %u "
-"signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
+"zu signatures\n"
msgstr ""
#: apt-pkg/cdrom.cc:715
@@ -2599,95 +2626,105 @@ msgstr "كتابة لائحة المصادر الجديدة\n"
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 apt-pkg/indexcopy.cc:834
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:513 apt-pkg/deb/dpkgpm.cc:532
+#: apt-pkg/deb/dpkgpm.cc:49
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "تم تثبيت %s"
+
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#, c-format
+msgid "Configuring %s"
+msgstr "تهيئة %s"
+
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#, c-format
+msgid "Removing %s"
+msgstr "إزالة %s"
+
+#: apt-pkg/deb/dpkgpm.cc:52
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:521
#, c-format
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:621
+#: apt-pkg/deb/dpkgpm.cc:605
#, c-format
msgid "Preparing %s"
msgstr "تحضير %s"
-#: apt-pkg/deb/dpkgpm.cc:597 apt-pkg/deb/dpkgpm.cc:622
+#: apt-pkg/deb/dpkgpm.cc:606
#, c-format
msgid "Unpacking %s"
msgstr "فتح %s"
-#: apt-pkg/deb/dpkgpm.cc:602 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/deb/dpkgpm.cc:611
#, c-format
msgid "Preparing to configure %s"
msgstr "التحضير لتهيئة %s"
-#: apt-pkg/deb/dpkgpm.cc:603 apt-pkg/deb/dpkgpm.cc:52
-#: apt-pkg/deb/dpkgpm.cc:628
-#, c-format
-msgid "Configuring %s"
-msgstr "تهيئة %s"
-
-#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606
-#: apt-pkg/deb/dpkgpm.cc:630 apt-pkg/deb/dpkgpm.cc:631
+#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
#, fuzzy, c-format
msgid "Processing triggers for %s"
msgstr "خطأ في معالجة الدليل %s"
-#: apt-pkg/deb/dpkgpm.cc:608 apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/deb/dpkgpm.cc:617
#, c-format
msgid "Installed %s"
msgstr "تم تثبيت %s"
-#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615
-#: apt-pkg/deb/dpkgpm.cc:616 apt-pkg/deb/dpkgpm.cc:638
-#: apt-pkg/deb/dpkgpm.cc:640 apt-pkg/deb/dpkgpm.cc:641
+#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
+#: apt-pkg/deb/dpkgpm.cc:625
#, c-format
msgid "Preparing for removal of %s"
msgstr "التحضير لإزالة %s"
-#: apt-pkg/deb/dpkgpm.cc:618 apt-pkg/deb/dpkgpm.cc:53
-#: apt-pkg/deb/dpkgpm.cc:643
-#, c-format
-msgid "Removing %s"
-msgstr "إزالة %s"
-
-#: apt-pkg/deb/dpkgpm.cc:619 apt-pkg/deb/dpkgpm.cc:644
+#: apt-pkg/deb/dpkgpm.cc:628
#, c-format
msgid "Removed %s"
msgstr "تم إزالة %s"
-#: apt-pkg/deb/dpkgpm.cc:624 apt-pkg/deb/dpkgpm.cc:649
+#: apt-pkg/deb/dpkgpm.cc:633
#, c-format
msgid "Preparing to completely remove %s"
msgstr "التحضير لإزالة %s بالكامل"
-#: apt-pkg/deb/dpkgpm.cc:625 apt-pkg/deb/dpkgpm.cc:650
+#: apt-pkg/deb/dpkgpm.cc:634
#, c-format
msgid "Completely removed %s"
msgstr "تمت إزالة %s بالكامل"
-#: apt-pkg/deb/dpkgpm.cc:775 apt-pkg/deb/dpkgpm.cc:805
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr ""
@@ -2696,146 +2733,9 @@ msgstr ""
msgid "Connection closed prematurely"
msgstr ""
-#: methods/gpgv.cc:232
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
-msgstr ""
-
-#: methods/http.cc:978 apt-pkg/contrib/mmap.cc:196
#, fuzzy
-msgid "Failed to truncate file"
-msgstr "فشلت كتابة الملف %s"
-
-#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:335
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:342
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:349
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:354
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1244
-#, c-format
-msgid ""
-"A error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used.GPG error: %s: %s\n"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1253
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:40
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-
-#: apt-pkg/indexrecords.cc:47
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "لاحظ، تحديد %s بدلاً من %s\n"
-
-#: apt-pkg/indexrecords.cc:81
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:678
-#, c-format
-msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:51
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "تم تثبيت %s"
-
-#: apt-pkg/deb/dpkgpm.cc:54
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1011
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1016
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1018
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1030
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:70
-#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:73
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "تعذر قفل دليل القائمة"
-
-#: apt-pkg/deb/debsystem.cc:82
-msgid ""
-"dpkg was interrupted, you must manually run 'sudo dpkg --configure -a' to "
-"correct the problem. "
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:100
-msgid "Not locked"
-msgstr ""
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:172
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "السطر %d طويل جداً (أقصاه %d)"
#, fuzzy
#~ msgid "Line %d too long (max %d)"
diff --git a/po/ast.po b/po/ast.po
new file mode 100644
index 000000000..01ee81acd
--- /dev/null
+++ b/po/ast.po
@@ -0,0 +1,2899 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: apt 0.7.18\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"PO-Revision-Date: 2009-05-21 09:37+0100\n"
+"Last-Translator: Marcos <marcos.alvarez.costales@gmail.com>\n"
+"Language-Team: Asturian <alministradores@softastur.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: cmdline/apt-cache.cc:143
+#, c-format
+msgid "Package %s version %s has an unmet dep:\n"
+msgstr "El paquete %s versin %s nun cumple una dependencia:\n"
+
+#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
+#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
+#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nun pue alcontrase'l paquete %s"
+
+#: cmdline/apt-cache.cc:247
+msgid "Total package names: "
+msgstr "Total de nomes de paquetes: "
+
+#: cmdline/apt-cache.cc:287
+msgid " Normal packages: "
+msgstr " Paquetes normales: "
+
+#: cmdline/apt-cache.cc:288
+msgid " Pure virtual packages: "
+msgstr " Paquetes virtuales puros: "
+
+#: cmdline/apt-cache.cc:289
+msgid " Single virtual packages: "
+msgstr " Paquetes virtuales cenciellos: "
+
+#: cmdline/apt-cache.cc:290
+msgid " Mixed virtual packages: "
+msgstr " Paquetes virtuales amestaos: "
+
+#: cmdline/apt-cache.cc:291
+msgid " Missing: "
+msgstr " Falten: "
+
+#: cmdline/apt-cache.cc:293
+msgid "Total distinct versions: "
+msgstr "Versiones distintes en total: "
+
+#: cmdline/apt-cache.cc:295
+msgid "Total distinct descriptions: "
+msgstr "Descriciones distintes en total: "
+
+#: cmdline/apt-cache.cc:297
+msgid "Total dependencies: "
+msgstr "Dependencies totales: "
+
+#: cmdline/apt-cache.cc:300
+msgid "Total ver/file relations: "
+msgstr "Relaciones versin/ficheru en total: "
+
+#: cmdline/apt-cache.cc:302
+msgid "Total Desc/File relations: "
+msgstr "Relaciones descricin/ficheru en total: "
+
+#: cmdline/apt-cache.cc:304
+msgid "Total Provides mappings: "
+msgstr "Mapes de provisiones en total: "
+
+#: cmdline/apt-cache.cc:316
+msgid "Total globbed strings: "
+msgstr "Cadenes globalizaes en total: "
+
+#: cmdline/apt-cache.cc:330
+msgid "Total dependency version space: "
+msgstr "Espaciu de dependencies de versin en total: "
+
+#: cmdline/apt-cache.cc:335
+msgid "Total slack space: "
+msgstr "Espaciu ociosu en total: "
+
+#: cmdline/apt-cache.cc:343
+msgid "Total space accounted for: "
+msgstr "Informe del total d'espaciu: "
+
+#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#, c-format
+msgid "Package file %s is out of sync."
+msgstr "El ficheru de paquetes %s nun ta sincronizu."
+
+#: cmdline/apt-cache.cc:1293
+msgid "You must give exactly one pattern"
+msgstr "Has de dar exautamente un patrn"
+
+#: cmdline/apt-cache.cc:1447
+msgid "No packages found"
+msgstr "Nun s'alcontraron paquetes"
+
+#: cmdline/apt-cache.cc:1524
+msgid "Package files:"
+msgstr "Ficheros de paquete:"
+
+#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"La cach nun ta sincronizada, nun puede facese x-ref a un ficheru de paquete"
+
+#: cmdline/apt-cache.cc:1532
+#, c-format
+msgid "%4i %s\n"
+msgstr "%4i %s\n"
+
+#. Show any packages have explicit pins
+#: cmdline/apt-cache.cc:1544
+msgid "Pinned packages:"
+msgstr "Paquetes na chincheta:"
+
+#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+msgid "(not found)"
+msgstr "(nun s'alcontr)"
+
+#. Installed version
+#: cmdline/apt-cache.cc:1577
+msgid " Installed: "
+msgstr " Instalu: "
+
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+msgid "(none)"
+msgstr "(dengn)"
+
+#. Candidate Version
+#: cmdline/apt-cache.cc:1584
+msgid " Candidate: "
+msgstr " Candidatu: "
+
+#: cmdline/apt-cache.cc:1594
+msgid " Package pin: "
+msgstr " Chincheta de paquetes: "
+
+#. Show the priority tables
+#: cmdline/apt-cache.cc:1603
+msgid " Version table:"
+msgstr " Tabla de versiones:"
+
+#: cmdline/apt-cache.cc:1618
+#, c-format
+msgid " %4i %s\n"
+msgstr " %4i %s\n"
+
+#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
+#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#, c-format
+msgid "%s %s for %s compiled on %s %s\n"
+msgstr "%s %s pa %s compilu en %s %s\n"
+
+#: cmdline/apt-cache.cc:1721
+msgid ""
+"Usage: apt-cache [options] command\n"
+" apt-cache [options] add file1 [file2 ...]\n"
+" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+" apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache is a low-level tool used to manipulate APT's binary\n"
+"cache files, and query information from them\n"
+"\n"
+"Commands:\n"
+" add - Add a package file to the source cache\n"
+" gencaches - Build both the package and source cache\n"
+" showpkg - Show some general information for a single package\n"
+" showsrc - Show source records\n"
+" stats - Show some basic statistics\n"
+" dump - Show the entire file in a terse form\n"
+" dumpavail - Print an available file to stdout\n"
+" unmet - Show unmet dependencies\n"
+" search - Search the package list for a regex pattern\n"
+" show - Show a readable record for the package\n"
+" depends - Show raw dependency information for a package\n"
+" rdepends - Show reverse dependency information for a package\n"
+" pkgnames - List the names of all packages in the system\n"
+" dotty - Generate package graphs for GraphViz\n"
+" xvcg - Generate package graphs for xvcg\n"
+" policy - Show policy settings\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -p=? The package cache.\n"
+" -s=? The source cache.\n"
+" -q Disable progress indicator.\n"
+" -i Show only important deps for the unmet command.\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+msgstr ""
+"Usu: apt-cache [opciones] orde\n"
+" apt-cache [opciones] add ficheru1 [ficheru2 ...]\n"
+" apt-cache [opciones] showpkg paq1 [paq2 ...]\n"
+" apt-cache [opciones] showsrc paq1 [paq2 ...]\n"
+"\n"
+"apt-cache ye una ferramienta de baxu nivel usada pa remanar\n"
+"ficheros de cach binarios d'APT y consultar informacin d'ellos\n"
+"\n"
+"Ordes:\n"
+" add - Amesta un ficheru de paquete a la cach fonte\n"
+" gencaches - Creal dambes cachs, la de paquetes y la de fontes\n"
+" showpkg - Amuesa algo d'informacin xeneral d'un slu paquete\n"
+" showsrc - Amuesa los rexistros de fonte\n"
+" stats - Amuesa dalgunes estadstiques bsiques\n"
+" dump - Amuesa'l ficheru ensembre en formatu tersu\n"
+" dumpavail - Imprenta un ficheru disponible na salida estndar\n"
+" unmet - Amuesa dependencies nun atopes\n"
+" search - Restola na llista de paquetes por el patrn d'una espresin "
+"regular\n"
+" show - Amuesa un rexistru lleble pal paquete\n"
+" depends - Amuesa la informacin de dependencies en bruto d'un paquete\n"
+" rdepends - Amuesa la informacin de dependencies inverses d'un paquete\n"
+" pkgnames - Llista los nomes de tolos paquetes nel sistema\n"
+" dotty - Xenera grfiques del paquete pa GraphViz\n"
+" xvcg - Xenera grfiques del paquete pa xvcg\n"
+" policy - Amuesa los axustes de les normes\n"
+"\n"
+"Opciones:\n"
+" -h Esti testu d'aida.\n"
+" -p=? La cache de paquetes.\n"
+" -s=? La cache de fontes.\n"
+" -q Desactiva l'indicador de progresu.\n"
+" -i Amuesa slo les dependencies importantes de la orde incumplida.\n"
+" -c=? Lleer esti ficheru de configuracin\n"
+" -o=? Consea una opcin de configuracin arbitraria, ex -o dir::cache=/"
+"tmp\n"
+"Ver les pxines del manual apt-cache(8) y apt.conf(5) pa ms informacin.\n"
+
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Da-y un nome a esti discu, como 'Debian 2.1r1 Discu 1'"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Inxerta un discu nel presu y calca intro"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Repite'l procesu colos dems CDs del conxuntu."
+
+#: cmdline/apt-config.cc:41
+msgid "Arguments not in pairs"
+msgstr "Argumentos non empareyaos"
+
+#: cmdline/apt-config.cc:76
+msgid ""
+"Usage: apt-config [options] command\n"
+"\n"
+"apt-config is a simple tool to read the APT config file\n"
+"\n"
+"Commands:\n"
+" shell - Shell mode\n"
+" dump - Show the configuration\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Usu: apt-config [opciones] orde\n"
+"\n"
+"apt-config ye una ferramienta pa lleer el ficheru de configuracin d'APT.\n"
+"\n"
+"Ordes:\n"
+" shell - Mou shell\n"
+" dump - Amuesa la configuracin\n"
+"\n"
+"Opciones:\n"
+" -h Esti testu d'aida.\n"
+" -c=? Llee esti ficheru de configuracin\n"
+" -o=? Consea una opcin de configuracin arbitraria, p. ex.\n"
+
+#: cmdline/apt-extracttemplates.cc:98
+#, c-format
+msgid "%s not a valid DEB package."
+msgstr "%s nun ye un paquete DEB vlidu."
+
+#: cmdline/apt-extracttemplates.cc:232
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -t Set the temp dir\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Usu: apt-extracttemplates ficheru1 [ficheru2 ...]\n"
+"\n"
+"apt-extracttemplates ye un presu pa sacar informacin de\n"
+"configuracin y plantes de paquetes de debian.\n"
+"\n"
+"Opciones:\n"
+"-h Esti testu d'aida.\n"
+"-t Define'l direutoriu temporal\n"
+"-c=? Llei esti ficheru de configuracin\n"
+"-o=? Afita una opcin de configuracin arbitraria, p. ej. -o dir::cache=/"
+"tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Nun se pue escribir en %s"
+
+#: cmdline/apt-extracttemplates.cc:310
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Nun se pue alcontrar la versin de debconf. Ta instalu debconf?"
+
+#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
+msgid "Package extension list is too long"
+msgstr "La llista d'estensin de paquetes ye demasiao llarga"
+
+#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
+#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
+#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Error al procesar el direutoriu %s"
+
+#: ftparchive/apt-ftparchive.cc:251
+msgid "Source extension list is too long"
+msgstr "La llista d'estensin de fontes ye demasiao llarga"
+
+#: ftparchive/apt-ftparchive.cc:368
+msgid "Error writing header to contents file"
+msgstr "Error al escribir la cabecera al ficheru de contenos"
+
+#: ftparchive/apt-ftparchive.cc:398
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Error al procesar contenos %s"
+
+#: ftparchive/apt-ftparchive.cc:553
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+" sources srcpath [overridefile [pathprefix]]\n"
+" contents path\n"
+" release path\n"
+" generate config [groups]\n"
+" clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" --md5 Control MD5 generation\n"
+" -s=? Source override file\n"
+" -q Quiet\n"
+" -d=? Select the optional caching database\n"
+" --no-delink Enable delinking debug mode\n"
+" --contents Control contents file generation\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option"
+msgstr ""
+"Uso: apt-ftparchive [escoyetes] orde\n"
+"Ordes: packages camin-binariu [ficheru-disvos [prefixu-camin]]\n"
+" sources camin-fonte [ficheru-disvos [prefixu-camin]]\n"
+" contents camin\n"
+" release camin\n"
+" generate config [grupos]\n"
+" clean config\n"
+"\n"
+"apt-ftparchive xenera ndices p'archivos de Debian. Sofita dellos\n"
+"estilos de xeneracin de reemplazos pa dpkg-scanpackages y\n"
+"dpkg-scansources, dende los automatizos dafechu a los funcionales .\n"
+"\n"
+"apt-ftparchive xenera ficheros Package d'un rbol de .debs. El ficheru\n"
+"Package tien los contenos de tolos campos de control de cada paquete,\n"
+"neto que la suma MD5 y el tamau del ficheru. Puede usase un ficheru\n"
+"de disvos pa forzar el valor de Priority y Section.\n"
+"\n"
+"De mou asemeyu, apt-ftparchive xenera ficheros Sources pa un rbol\n"
+"de .dscs. Puede utilizase la opcin --source-override pa consear un\n"
+"ficheru de disvu de fonte.\n"
+"\n"
+"Les ordes packages y sources han d'executase na raiz de l'rbol.\n"
+"BinaryPath tien qu'apuntar a la base de la gueta recursiva, y el ficheru\n"
+"de disvos tien que contener les marques de los disvos. El prefixu de\n"
+"camn, si esiste, amstase a los campos de nome de ficheru. Darru,\n"
+"un exemplu d'usu basu nos archivos de Debian:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Escoyetes:\n"
+" -h Esti testu d'aida\n"
+" --md5 Xenerar control MD5 \n"
+" -s=? Ficheru de disvu de fontes\n"
+" -q Sele\n"
+" -d=? Seleiciona la base de datos de cach opcional \n"
+" --no-delink Activa'l mou de depuracin de desenllaces\n"
+" --contents Xenerar ficheru de contenos de control\n"
+" -c=? Lleer esti ficheru de configuracin\n"
+" -o=? Afita una escoyeta de configuracin propia"
+
+#: ftparchive/apt-ftparchive.cc:759
+msgid "No selections matched"
+msgstr "Nun concas denguna seleicin"
+
+#: ftparchive/apt-ftparchive.cc:832
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Falten dellos ficheros nel grupu de ficheros de paquete `%s'"
+
+#: ftparchive/cachedb.cc:43
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "La BD corrompiose, ficheru renomu como %s.old"
+
+#: ftparchive/cachedb.cc:61
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "La DB ye antigua, tentando actualizar %s"
+
+#: ftparchive/cachedb.cc:72
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+"El formatu de la base de datos nun ye vlidu. Si anovaste dende una versin "
+"anterior d'apt, desanicia y recrea la base de datos."
+
+#: ftparchive/cachedb.cc:77
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Nun pudo abrise'l ficheru de BD %s: %s"
+
+#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
+#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Nun pudo lleese %s"
+
+#: ftparchive/cachedb.cc:238
+msgid "Archive has no control record"
+msgstr "L'archivu nun tien rexistru de control"
+
+#: ftparchive/cachedb.cc:444
+msgid "Unable to get a cursor"
+msgstr "Nun pudo algamase un cursor"
+
+#: ftparchive/writer.cc:76
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "A: Nun pudo lleese'l direutoriu %s\n"
+
+#: ftparchive/writer.cc:81
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "A: Nun pudo lleese %s\n"
+
+#: ftparchive/writer.cc:132
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:134
+msgid "W: "
+msgstr "A: "
+
+#: ftparchive/writer.cc:141
+msgid "E: Errors apply to file "
+msgstr "E: Errores aplicables al ficheru "
+
+#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Nun pudo resolvese %s"
+
+#: ftparchive/writer.cc:170
+msgid "Tree walking failed"
+msgstr "Fall'l percorru pol rbol"
+
+#: ftparchive/writer.cc:195
+#, c-format
+msgid "Failed to open %s"
+msgstr "Nun pudo abrise %s"
+
+#: ftparchive/writer.cc:254
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " Desenllazar %s [%s]\n"
+
+#: ftparchive/writer.cc:262
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Nun pudo lleese l'enllaz %s"
+
+#: ftparchive/writer.cc:266
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Nun pudo desenllazase %s"
+
+#: ftparchive/writer.cc:273
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Fall enllazar enllazr %s a %s"
+
+#: ftparchive/writer.cc:283
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Alcanzose'l llmite of %sB de desenllaz.\n"
+
+#: ftparchive/writer.cc:387
+msgid "Archive had no package field"
+msgstr "L'archivu nun tien el campu paquetes"
+
+#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#, c-format
+msgid " %s has no override entry\n"
+msgstr " %s nun tien la entrada saltos\n"
+
+#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#, c-format
+msgid " %s maintainer is %s not %s\n"
+msgstr " el curiador de %s ye %s y non %s\n"
+
+#: ftparchive/writer.cc:620
+#, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s nun tien la entrada saltos de fonte\n"
+
+#: ftparchive/writer.cc:624
+#, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s tampoco nun tiene una entrada binaria de saltos\n"
+
+#: ftparchive/contents.cc:321
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "Error internu, nun se pue atopar el miembru %s"
+
+#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Nun pudo allugase memoria"
+
+#: ftparchive/override.cc:34 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Nun pudo abrise %s"
+
+#: ftparchive/override.cc:60 ftparchive/override.cc:166
+#, c-format
+msgid "Malformed override %s line %lu #1"
+msgstr "Saltu mal formu %s llinia %lu #1"
+
+#: ftparchive/override.cc:74 ftparchive/override.cc:178
+#, c-format
+msgid "Malformed override %s line %lu #2"
+msgstr "Saltu mal formu %s llinia %lu #2"
+
+#: ftparchive/override.cc:88 ftparchive/override.cc:191
+#, c-format
+msgid "Malformed override %s line %lu #3"
+msgstr "Saltu mal formu %s llinia %lu #3"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Nun pudo lleese'l ficheru de saltos %s"
+
+#: ftparchive/multicompress.cc:72
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Algoritmu de compresin desconocu '%s'"
+
+#: ftparchive/multicompress.cc:102
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "La salida comprimida %s necesita un xuegu de compresin"
+
+#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "Fall criar un tubu IPC al soprocesu"
+
+#: ftparchive/multicompress.cc:195
+msgid "Failed to create FILE*"
+msgstr "Nun pudo criase FICHERU*"
+
+#: ftparchive/multicompress.cc:198
+msgid "Failed to fork"
+msgstr "Nun pudo biforcase"
+
+#: ftparchive/multicompress.cc:212
+msgid "Compress child"
+msgstr "Comprimir fu"
+
+#: ftparchive/multicompress.cc:235
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Error internu, nun pudo criase %s"
+
+#: ftparchive/multicompress.cc:286
+msgid "Failed to create subprocess IPC"
+msgstr "Nun pudo criase'l soprocesu IPC"
+
+#: ftparchive/multicompress.cc:321
+msgid "Failed to exec compressor "
+msgstr "Nun pudo executase'l compresor "
+
+#: ftparchive/multicompress.cc:360
+msgid "decompressor"
+msgstr "descompresor"
+
+#: ftparchive/multicompress.cc:403
+msgid "IO to subprocess/file failed"
+msgstr "Fallu na ES al soprocesu/ficheru"
+
+#: ftparchive/multicompress.cc:455
+msgid "Failed to read while computing MD5"
+msgstr "Nun pudo lleese al computar MD5"
+
+#: ftparchive/multicompress.cc:472
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Problema al desenllazar %s"
+
+#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Nun pudo renomase %s como %s"
+
+#: cmdline/apt-get.cc:124
+msgid "Y"
+msgstr "S"
+
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Error de compilacin d'espresin regular - %s"
+
+#: cmdline/apt-get.cc:241
+msgid "The following packages have unmet dependencies:"
+msgstr "Los siguientes paquetes nun cumplen dependencies:"
+
+#: cmdline/apt-get.cc:331
+#, c-format
+msgid "but %s is installed"
+msgstr "pero %s ta instalu"
+
+#: cmdline/apt-get.cc:333
+#, c-format
+msgid "but %s is to be installed"
+msgstr "pero %s ta pa instalar"
+
+#: cmdline/apt-get.cc:340
+msgid "but it is not installable"
+msgstr "pero nun ye instalable"
+
+#: cmdline/apt-get.cc:342
+msgid "but it is a virtual package"
+msgstr "pero ye un paquete virtual"
+
+#: cmdline/apt-get.cc:345
+msgid "but it is not installed"
+msgstr "pero nun ta instalu"
+
+#: cmdline/apt-get.cc:345
+msgid "but it is not going to be installed"
+msgstr "pero nun va instalase"
+
+#: cmdline/apt-get.cc:350
+msgid " or"
+msgstr " o"
+
+#: cmdline/apt-get.cc:379
+msgid "The following NEW packages will be installed:"
+msgstr "Van instalase los siguientes paquetes NUEVOS:"
+
+#: cmdline/apt-get.cc:405
+msgid "The following packages will be REMOVED:"
+msgstr "Los siguientes paquetes van DESANICIASE:"
+
+#: cmdline/apt-get.cc:427
+msgid "The following packages have been kept back:"
+msgstr "Los siguientes paquetes tan retenos:"
+
+#: cmdline/apt-get.cc:448
+msgid "The following packages will be upgraded:"
+msgstr "Los siguientes paquetes van actualizase:"
+
+#: cmdline/apt-get.cc:469
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Los siguientes paquetes van DESACTUALIZASE:"
+
+#: cmdline/apt-get.cc:489
+msgid "The following held packages will be changed:"
+msgstr "Van camudase los siguientes paquetes retenos:"
+
+#: cmdline/apt-get.cc:542
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (por %s) "
+
+#: cmdline/apt-get.cc:550
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"AVISU: Los siguientes paquetes esenciales van desaniciase.\n"
+"Esto NUN hai que facelo si nun sabes esautamente lo que faes!"
+
+#: cmdline/apt-get.cc:581
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu actualizaos, %lu nuevos instalaos, "
+
+#: cmdline/apt-get.cc:585
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalaos, "
+
+#: cmdline/apt-get.cc:587
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu desactualizaos, "
+
+#: cmdline/apt-get.cc:589
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu para desaniciar y %lu nun actualizaos.\n"
+
+#: cmdline/apt-get.cc:593
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
+
+#: cmdline/apt-get.cc:667
+msgid "Correcting dependencies..."
+msgstr "Iguando dependencies..."
+
+#: cmdline/apt-get.cc:670
+msgid " failed."
+msgstr " fall."
+
+#: cmdline/apt-get.cc:673
+msgid "Unable to correct dependencies"
+msgstr "Nun pudieron iguase les dependencies"
+
+#: cmdline/apt-get.cc:676
+msgid "Unable to minimize the upgrade set"
+msgstr "Nun pue amenorgase'l conxuntu d'actualizacin"
+
+#: cmdline/apt-get.cc:678
+msgid " Done"
+msgstr " Fecho"
+
+#: cmdline/apt-get.cc:682
+msgid "You might want to run `apt-get -f install' to correct these."
+msgstr "Habres d'executar `apt-get -f install' para igualo."
+
+#: cmdline/apt-get.cc:685
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependencies incumples. Tntalo usando -f."
+
+#: cmdline/apt-get.cc:707
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "AVISU: Nun pudieron autenticase los siguientes paquetes!"
+
+#: cmdline/apt-get.cc:711
+msgid "Authentication warning overridden.\n"
+msgstr "Avisu d'autenticacin saltu.\n"
+
+#: cmdline/apt-get.cc:718
+msgid "Install these packages without verification [y/N]? "
+msgstr "Instalar esos paquetes ensin verificacin [s/N]? "
+
+#: cmdline/apt-get.cc:720
+msgid "Some packages could not be authenticated"
+msgstr "Dellos paquetes nun pudieron autenticase"
+
+#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Hai problemes y utilizose -y ensin --force-yes"
+
+#: cmdline/apt-get.cc:773
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Error internu, InstallPackages llamose con paquetes fraaos!"
+
+#: cmdline/apt-get.cc:782
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torgu."
+
+#: cmdline/apt-get.cc:793
+msgid "Internal error, Ordering didn't finish"
+msgstr "Error internu, ordenar nun fin"
+
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+msgid "Unable to lock the download directory"
+msgstr "Nun pue bloquiase'l direutoriu de descarga"
+
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: apt-pkg/cachefile.cc:65
+msgid "The list of sources could not be read."
+msgstr "Nun pudo lleese la llista de fontes."
+
+#: cmdline/apt-get.cc:834
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr "Que raro.. Los tamaos nun concasen, escribe a apt@packages.debian.org"
+
+#: cmdline/apt-get.cc:839
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Hai que descargar %sB/%sB d'archivos.\n"
+
+#: cmdline/apt-get.cc:842
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Hai que descargar %sB d'archivos.\n"
+
+#: cmdline/apt-get.cc:847
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Tres d'esta operacin, van usase %sB d'espaciu de discu adicional.\n"
+
+#: cmdline/apt-get.cc:850
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "Tres d'esta operacin, van lliberase %sB d'espaciu de discu.\n"
+
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "Nun pue determinase l'espaciu llibre de %s"
+
+#: cmdline/apt-get.cc:871
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Nun tienes espaciu libre bastante en %s."
+
+#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "Conseose Trivial Only pero sta nun ye una operacin trivial."
+
+#: cmdline/apt-get.cc:889
+msgid "Yes, do as I say!"
+msgstr "S, facer lo que digo!"
+
+#: cmdline/apt-get.cc:891
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Tas a piques de facer daqu potencialmente daible.\n"
+"Pa continuar escribe la frase '%s'\n"
+" ?] "
+
+#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+msgid "Abort."
+msgstr "Encaboxar."
+
+#: cmdline/apt-get.cc:912
+msgid "Do you want to continue [Y/n]? "
+msgstr "Quies continuar [S/n]? "
+
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#, c-format
+msgid "Failed to fetch %s %s\n"
+msgstr "Fall algamar %s %s\n"
+
+#: cmdline/apt-get.cc:1002
+msgid "Some files failed to download"
+msgstr "Dellos ficheros nun pudieron descargase"
+
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+msgid "Download complete and in download only mode"
+msgstr "Descarga completa y en mou de slo descarga"
+
+#: cmdline/apt-get.cc:1009
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Nun pudieron algamase dellos archivos, seique executando apt-get update o "
+"tentando --fix-missing?"
+
+#: cmdline/apt-get.cc:1013
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "--fix-missing y cambu de mediu nun ta sofitao actualmente"
+
+#: cmdline/apt-get.cc:1018
+msgid "Unable to correct missing packages."
+msgstr "Nun pudieron iguase los paquetes que falten."
+
+#: cmdline/apt-get.cc:1019
+msgid "Aborting install."
+msgstr "Encaboxando la instalacin."
+
+#: cmdline/apt-get.cc:1053
+#, c-format
+msgid "Note, selecting %s instead of %s\n"
+msgstr "Nota, escoyendo %s nel llugar de %s\n"
+
+#: cmdline/apt-get.cc:1063
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Saltando %s, ya ta instalau y la actualizacin nun ta activada.\n"
+
+#: cmdline/apt-get.cc:1081
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
+
+#: cmdline/apt-get.cc:1092
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "El paquete %s ye un paquete virtual ufru por:\n"
+
+#: cmdline/apt-get.cc:1104
+msgid " [Installed]"
+msgstr " [Instalu]"
+
+#: cmdline/apt-get.cc:1109
+msgid "You should explicitly select one to install."
+msgstr "Has d'escoyer esplcitamente unu pa instalar."
+
+#: cmdline/apt-get.cc:1114
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"El paquete %s nun ta disponible, otru paquete refierse a l.\n"
+"Esto puede significar que falta el paquete, ta arrumbu, o slo\n"
+"ta disponible dende otra fonte\n"
+
+#: cmdline/apt-get.cc:1133
+msgid "However the following packages replace it:"
+msgstr "Sicas, los siguientes paquetes reemplacenlu:"
+
+#: cmdline/apt-get.cc:1136
+#, c-format
+msgid "Package %s has no installation candidate"
+msgstr "El paquete %s nun tien candidatu pa instalacin"
+
+#: cmdline/apt-get.cc:1156
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "La reinstalacin de %s nun ye dable, nun pue descargase.\n"
+
+#: cmdline/apt-get.cc:1164
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s y ta na versin ms nueva.\n"
+
+#: cmdline/apt-get.cc:1193
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Nun s'alcontr la distribucin '%s' pa '%s'"
+
+#: cmdline/apt-get.cc:1195
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Nun s'alcontr la versin '%s' pa '%s'"
+
+#: cmdline/apt-get.cc:1201
+#, c-format
+msgid "Selected version %s (%s) for %s\n"
+msgstr "Escoyida la versin %s (%s) pa %s\n"
+
+#: cmdline/apt-get.cc:1338
+msgid "The update command takes no arguments"
+msgstr "La orde update nun lleva argumentos"
+
+#: cmdline/apt-get.cc:1351
+msgid "Unable to lock the list directory"
+msgstr "Nun pudo bloquiase'l direutoriu de llista"
+
+#: cmdline/apt-get.cc:1403
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover"
+
+#: cmdline/apt-get.cc:1435
+msgid ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr ""
+"Los siguientes paquetes instalaronse de manera automtica y ya nun se "
+"necesiten:"
+
+#: cmdline/apt-get.cc:1437
+msgid "Use 'apt-get autoremove' to remove them."
+msgstr "Usa 'apt-get autoremove' pa desinstalalos."
+
+#: cmdline/apt-get.cc:1442
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+"Hmm, paez que AutoRemover destruy daqu, lo que nun tendra\n"
+"por qu pasar. Por favor, unva un informe de fallu escontra apt."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << endl;
+#. }
+#.
+#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+msgid "The following information may help to resolve the situation:"
+msgstr "La siguiente informacin pue aidar a resolver la situacin:"
+
+#: cmdline/apt-get.cc:1449
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Error internu, AutoRemover rompi coses"
+
+#: cmdline/apt-get.cc:1468
+msgid "Internal error, AllUpgrade broke stuff"
+msgstr "Error internu, AllUpgrade rompi coses"
+
+#: cmdline/apt-get.cc:1523
+#, c-format
+msgid "Couldn't find task %s"
+msgstr "Nun pudo alcontrase la tarea %s"
+
+#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Nun pudo alcontrase'l paquete %s"
+
+#: cmdline/apt-get.cc:1661
+#, c-format
+msgid "Note, selecting %s for regex '%s'\n"
+msgstr "Nota, escoyendo %s pa la espresin regular '%s'\n"
+
+#: cmdline/apt-get.cc:1692
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s axustu como instalu manualmente.\n"
+
+#: cmdline/apt-get.cc:1705
+msgid "You might want to run `apt-get -f install' to correct these:"
+msgstr "Habres d'executar `apt-get -f install' para iguar estos:"
+
+#: cmdline/apt-get.cc:1708
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o "
+"consea una solucin)."
+
+#: cmdline/apt-get.cc:1720
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Dellos paquetes nun pudieron instalase. Esto puede significar que\n"
+"conseaste una situacin imposible o, si tas usando la distribucin\n"
+"inestable, que dellos paquetes necesarios nun se crearon o que\n"
+"s'allugaron fuera d'Incoming."
+
+#: cmdline/apt-get.cc:1738
+msgid "Broken packages"
+msgstr "Paquetes fraaos"
+
+#: cmdline/apt-get.cc:1767
+msgid "The following extra packages will be installed:"
+msgstr "Instalarnse los siguientes paquetes extra:"
+
+#: cmdline/apt-get.cc:1856
+msgid "Suggested packages:"
+msgstr "Paquetes afalaos:"
+
+#: cmdline/apt-get.cc:1857
+msgid "Recommended packages:"
+msgstr "Paquetes encamentaos"
+
+#: cmdline/apt-get.cc:1885
+msgid "Calculating upgrade... "
+msgstr "Calculando l'autualizacin... "
+
+#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+msgid "Failed"
+msgstr "Fall"
+
+#: cmdline/apt-get.cc:1893
+msgid "Done"
+msgstr "Fecho"
+
+#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+msgid "Internal error, problem resolver broke stuff"
+msgstr "Error internu, l'iguador de problemes fra coses"
+
+#: cmdline/apt-get.cc:2068
+msgid "Must specify at least one package to fetch source for"
+msgstr "Has de consear polo menos un paquete p'algamar so fonte"
+
+#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Nun pudo alcontrase un paquete fonte pa %s"
+
+#: cmdline/apt-get.cc:2147
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Saltando'l ficheru y descargu '%s'\n"
+
+#: cmdline/apt-get.cc:2175
+#, c-format
+msgid "You don't have enough free space in %s"
+msgstr "Nun hai espaciu llibre bastante en %s"
+
+#: cmdline/apt-get.cc:2181
+#, c-format
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n"
+
+#: cmdline/apt-get.cc:2184
+#, c-format
+msgid "Need to get %sB of source archives.\n"
+msgstr "Hai falta descargar %sB d'archivos fonte.\n"
+
+#: cmdline/apt-get.cc:2190
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Fonte descargada %s\n"
+
+#: cmdline/apt-get.cc:2221
+msgid "Failed to fetch some archives."
+msgstr "Fall la descarga de dellos archivos."
+
+#: cmdline/apt-get.cc:2249
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Saltando'l desempaquetu de la fonte y desempaquetada en %s\n"
+
+#: cmdline/apt-get.cc:2261
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Fall la orde de desempaquetu '%s'.\n"
+
+#: cmdline/apt-get.cc:2262
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instalu.\n"
+
+#: cmdline/apt-get.cc:2279
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Fall la orde build '%s'.\n"
+
+#: cmdline/apt-get.cc:2298
+msgid "Child process failed"
+msgstr "Fall el procesu fu"
+
+#: cmdline/apt-get.cc:2314
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Hai que consear polo menos un paquete pa verificar les dependencies de "
+"construccin"
+
+#: cmdline/apt-get.cc:2342
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Nun pudo algamase informacin de dependencies de construccin pa %s"
+
+#: cmdline/apt-get.cc:2362
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s nun tien dependencies de construccin.\n"
+
+#: cmdline/apt-get.cc:2414
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
+"paquete %s"
+
+#: cmdline/apt-get.cc:2467
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because no available versions of "
+"package %s can satisfy version requirements"
+msgstr ""
+"La dependencia %s en %s nun puede satisfacese porque denguna versin "
+"disponible del paquete %s satisfaz los requisitos de versin"
+
+#: cmdline/apt-get.cc:2503
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Nun se pudo satisfacer la dependencia %s pa %s: El paquete instalu %s ye "
+"demasiao nuevu"
+
+#: cmdline/apt-get.cc:2528
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s"
+
+#: cmdline/apt-get.cc:2542
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Les dependencies de construccin de %s nun pudieron satisfacese."
+
+#: cmdline/apt-get.cc:2546
+msgid "Failed to process build dependencies"
+msgstr "Fallu al procesar les dependencies de construccin"
+
+#: cmdline/apt-get.cc:2578
+msgid "Supported modules:"
+msgstr "Mdulos sofitaos:"
+
+#: cmdline/apt-get.cc:2619
+msgid ""
+"Usage: apt-get [options] command\n"
+" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+" apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get is a simple command line interface for downloading and\n"
+"installing packages. The most frequently used commands are update\n"
+"and install.\n"
+"\n"
+"Commands:\n"
+" update - Retrieve new lists of packages\n"
+" upgrade - Perform an upgrade\n"
+" install - Install new packages (pkg is libc6 not libc6.deb)\n"
+" remove - Remove packages\n"
+" autoremove - Remove automatically all unused packages\n"
+" purge - Remove and purge packages\n"
+" source - Download source archives\n"
+" build-dep - Configure build-dependencies for source packages\n"
+" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+" dselect-upgrade - Follow dselect selections\n"
+" clean - Erase downloaded archive files\n"
+" autoclean - Erase old downloaded archive files\n"
+" check - Verify that there are no broken dependencies\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -q Loggable output - no progress indicator\n"
+" -qq No output except for errors\n"
+" -d Download only - do NOT install or unpack archives\n"
+" -s No-act. Perform ordering simulation\n"
+" -y Assume Yes to all queries and do not prompt\n"
+" -f Attempt to correct a system with broken dependencies in place\n"
+" -m Attempt to continue if archives are unlocatable\n"
+" -u Show a list of upgraded packages as well\n"
+" -b Build the source package after fetching it\n"
+" -V Show verbose version numbers\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+"pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
+msgstr ""
+"Usu: apt-get [opciones] comandu\n"
+" apt-get [opciones] install|remove pkg1 [pkg2 ...]\n"
+" apt-get [opciones] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get ye una interface de llnia de comandos simple pa baxar ya\n"
+"instalar paquetes. L'usu ms frecuente de comandos ye p'anovar\n"
+"ya instalar.\n"
+"\n"
+"Comandos:\n"
+" update - Algamar nueva llista de paquetes\n"
+" upgrade - Facer una actualizacin\n"
+" install - Instalar nuevos paquetes (pkg ye libc6 no libc6.deb)\n"
+" remove - Desaniciar paquetes\n"
+" autoremove - Desaniciar automticamente tolos paquetes non usaos\n"
+" purge - Quitar y desaniciar paquetes\n"
+" source - Baxar fonte del archivu\n"
+" build-dep - Configurar dependencies pa los paquetes fonte\n"
+" dist-upgrade - Actualizacin de la distribucin, ver apt-get(8)\n"
+" dselect-upgrade - Siguir seleiciones dselect\n"
+" clean - Esborrar los ficheros de ficheros baxaos\n"
+" autoclean - Esborrar ficheros de ficheros vieyos baxaos\n"
+" check - Verificar que nun hai dependencies frayaes\n"
+"\n"
+"Opciones:\n"
+" -h Esti testu d'aida.\n"
+" -q Salida Log - ensn indicacin de progresu\n"
+" -qq Ensn salida excepto pa fallos\n"
+" -d Baxar slo - NON instalar o desempaquetar los archivos\n"
+" -s No aicin. Facer una simulacin ordenada\n"
+" -y Asumir Yes pa toles entruges y nun visualizar la peticin\n"
+" -f Intentar correxir un sistema con dependencies frayaes\n"
+" -m Intentar siguir si los archivos nun tan disponibles\n"
+" -u Amosar una lilsta de paquetes que tan bien\n"
+" -b Facer el paquete fonte dempues d'algamalu\n"
+" -V Amosar nmberos de versiones\n"
+" -c=? Lleer esti ficheru de configuracin\n"
+" -o=? Afitar una opcin de configuracin arbitraria, p. ex. -o dir::cache=/"
+"tmp\n"
+"Ver ls pxines de los manuales d' apt-get(8), sources.list(5) y apt.conf"
+"(5)\n"
+"pa ms informacin y opciones.\n"
+" Esti APT tien Poderes de Super Vaca.\n"
+
+#: cmdline/acqprogress.cc:55
+msgid "Hit "
+msgstr "Oxe "
+
+#: cmdline/acqprogress.cc:79
+msgid "Get:"
+msgstr "Des:"
+
+#: cmdline/acqprogress.cc:110
+msgid "Ign "
+msgstr "Ign "
+
+#: cmdline/acqprogress.cc:114
+msgid "Err "
+msgstr "Err "
+
+#: cmdline/acqprogress.cc:135
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "Descargaos %sB en %s (%sB/s)\n"
+
+#: cmdline/acqprogress.cc:225
+#, c-format
+msgid " [Working]"
+msgstr " [Tresnando]"
+
+#: cmdline/acqprogress.cc:271
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Cambeu de mediu: Por favor meti'l discu etiquetu\n"
+" '%s'\n"
+"na unid '%s' y calca Intro\n"
+
+#: cmdline/apt-sortpkgs.cc:86
+msgid "Unknown package record!"
+msgstr "Rexistru de paquetes desconocu!"
+
+#: cmdline/apt-sortpkgs.cc:150
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -s Use source file sorting\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Usu: apt-sortpkgs [opciones] ficheru1 [ficheru2 ...]\n"
+"\n"
+"apt-sortpkgs ye un presu cenciellu pa tresnar ficheros de paquetes.\n"
+"La opcin -s sase pa indicar qu triba de ficheru ye.\n"
+"\n"
+"Opciones:\n"
+"-h Esti testu d'aida.\n"
+"-s Usa ordenamientu de ficheros fonte\n"
+"-c=? Llei esti ficheru de configuracin\n"
+"-o=? Afita una opcin de configuracin arbitraria, p. ej. -o dir::\n"
+"cache=/tmp\n"
+
+#: dselect/install:32
+msgid "Bad default setting!"
+msgstr "Mal axuste por omisin!"
+
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
+#: dselect/install:105 dselect/update:45
+msgid "Press enter to continue."
+msgstr "Calca Intro pa continuar."
+
+#: dselect/install:91
+msgid "Do you want to erase any previously downloaded .deb files?"
+msgstr "Quies desaniciar los ficheros .deb descargaos previamente?"
+
+#: dselect/install:101
+msgid "Some errors occurred while unpacking. I'm going to configure the"
+msgstr "Ocurrieron dellos errores al desempaquetar. Va configurarse'l"
+
+#: dselect/install:102
+msgid "packages that were installed. This may result in duplicate errors"
+msgstr "paquetes que s'instalaron. Esto pue causar errores duplicaos"
+
+#: dselect/install:103
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr ""
+"o fallos causaos por dependencies que nun tn. Esto ta BIEN, slo los fallos"
+
+#: dselect/install:104
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
+msgstr ""
+"enriba d'esti mensaxe son importante. Por favor, guales y executa [I]nstall "
+"otra vuelta"
+
+#: dselect/update:30
+msgid "Merging available information"
+msgstr "Fusionando informacin disponible"
+
+#: apt-inst/contrib/extracttar.cc:114
+msgid "Failed to create pipes"
+msgstr "Fallu al crear les tuberes"
+
+#: apt-inst/contrib/extracttar.cc:141
+msgid "Failed to exec gzip "
+msgstr "Fallu al executar gzip "
+
+#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+msgid "Corrupted archive"
+msgstr "Ficheru tollu"
+
+#: apt-inst/contrib/extracttar.cc:193
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Fall la suma de control de tar, ficheru tollu"
+
+#: apt-inst/contrib/extracttar.cc:296
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Testera del TAR triba %u desconocida, miembru %s"
+
+#: apt-inst/contrib/arfile.cc:70
+msgid "Invalid archive signature"
+msgstr "Robla del ficheru invlida"
+
+#: apt-inst/contrib/arfile.cc:78
+msgid "Error reading archive member header"
+msgstr "Fallu al lleer la testera de miembru del ficheru"
+
+#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
+msgid "Invalid archive member header"
+msgstr "Testera de miembur del ficheru invlida"
+
+#: apt-inst/contrib/arfile.cc:128
+msgid "Archive is too short"
+msgstr "El ficheru ye perpequeu"
+
+#: apt-inst/contrib/arfile.cc:132
+msgid "Failed to read the archive headers"
+msgstr "Fall al lleer les testeres del ficheru"
+
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "Llamse a DropNode nun nodu que ta ent enllazu"
+
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Fallu al atopar l'elementu enllazu!"
+
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Fall al allugar una desvu"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Fallu internu en AddDiversion"
+
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Intentando sobrescribir un desvu, %s -> %s and %s/%s"
+
+#: apt-inst/filelist.cc:506
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Doble suma de desvu %s -> %s"
+
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Ficheru de configuracin duplicu %s/%s"
+
+#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Fall la escritura nel ficheru %s"
+
+#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Fall al pesllar el ficheru %s"
+
+#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#, c-format
+msgid "The path %s is too long"
+msgstr "La trayeutoria %s ye demasiao llarga"
+
+#: apt-inst/extract.cc:124
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "Desempaquetando %s ms d'una vegada"
+
+#: apt-inst/extract.cc:134
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "El direutorio %s ta desviu"
+
+#: apt-inst/extract.cc:144
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "El paquete ta tentando escribir nel oxetivu desviu %s/%s"
+
+#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+msgid "The diversion path is too long"
+msgstr "La trayeutoria de desviacin ye demasiao llarga"
+
+#: apt-inst/extract.cc:240
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "El direutoriu %s ta reemplazndose por un non-direutoriu"
+
+#: apt-inst/extract.cc:280
+msgid "Failed to locate node in its hash bucket"
+msgstr "Fallu al atopar el nodu nel so bote d'enllaz"
+
+#: apt-inst/extract.cc:284
+msgid "The path is too long"
+msgstr "La trayeutoria ye perllarga"
+
+#: apt-inst/extract.cc:414
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "Sobreescribiendo concordancia del paquete ensin versin pa %s"
+
+#: apt-inst/extract.cc:431
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s"
+
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#, c-format
+msgid "Unable to read %s"
+msgstr "Nun ye a lleer %s"
+
+#: apt-inst/extract.cc:491
+#, c-format
+msgid "Unable to stat %s"
+msgstr "Nun ye a lleer %s"
+
+#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#, c-format
+msgid "Failed to remove %s"
+msgstr "Nun ye a desaniciar %s"
+
+#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#, c-format
+msgid "Unable to create %s"
+msgstr "Nun ye a crear %s"
+
+#: apt-inst/deb/dpkgdb.cc:114
+#, c-format
+msgid "Failed to stat %sinfo"
+msgstr "Nun ye a lleer %s"
+
+#: apt-inst/deb/dpkgdb.cc:119
+msgid "The info and temp directories need to be on the same filesystem"
+msgstr ""
+"Los direutorios info y temp tienen de tar nel mesmu sistema de ficheros"
+
+#. Build the status cache
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:760
+#: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834
+#: apt-pkg/pkgcachegen.cc:957
+msgid "Reading package lists"
+msgstr "Lleendo llista de paquetes"
+
+#: apt-inst/deb/dpkgdb.cc:176
+#, c-format
+msgid "Failed to change to the admin dir %sinfo"
+msgstr "Fallu al camudar al direutoriu d'alministracin %sinfo"
+
+#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
+#: apt-inst/deb/dpkgdb.cc:444
+msgid "Internal error getting a package name"
+msgstr "Fallu internu al obtener un Nome de Paquete"
+
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+msgid "Reading file listing"
+msgstr "Lleendo llistu de ficheros"
+
+#: apt-inst/deb/dpkgdb.cc:212
+#, c-format
+msgid ""
+"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
+"then make it empty and immediately re-install the same version of the "
+"package!"
+msgstr ""
+"Nun pude abrir el ficheru de llista '%sinfo/%s'. Si nun yes a restablecer "
+"esti ficheru ents crea n baleru y darru reinstala la mesma versin del "
+"paquete!"
+
+#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#, c-format
+msgid "Failed reading the list file %sinfo/%s"
+msgstr "Fallu al lleer el ficheru de llista %sinfo/%s"
+
+#: apt-inst/deb/dpkgdb.cc:262
+msgid "Internal error getting a node"
+msgstr "Fallu internu al obtener un nodu"
+
+#: apt-inst/deb/dpkgdb.cc:305
+#, c-format
+msgid "Failed to open the diversions file %sdiversions"
+msgstr "Fallu al abrir el ficheru de desviacin %sdiversions"
+
+#: apt-inst/deb/dpkgdb.cc:320
+msgid "The diversion file is corrupted"
+msgstr "El ficheru de desviacin ta tollu"
+
+#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
+#: apt-inst/deb/dpkgdb.cc:337
+#, c-format
+msgid "Invalid line in the diversion file: %s"
+msgstr "Llinia invlida nel ficheru de desviacin: %s"
+
+#: apt-inst/deb/dpkgdb.cc:358
+msgid "Internal error adding a diversion"
+msgstr "Fallu internu al amestar una desviacin"
+
+#: apt-inst/deb/dpkgdb.cc:379
+msgid "The pkg cache must be initialized first"
+msgstr "El cach del paquete tien d'entamase primero"
+
+#: apt-inst/deb/dpkgdb.cc:439
+#, c-format
+msgid "Failed to find a Package: header, offset %lu"
+msgstr "Fallu al atopar un paquete: Testera, desplazamientu %lu"
+
+#: apt-inst/deb/dpkgdb.cc:461
+#, c-format
+msgid "Bad ConfFile section in the status file. Offset %lu"
+msgstr "Estaya mala del ConfFile nel ficheru d'estau. Desplazamientu %lu"
+
+#: apt-inst/deb/dpkgdb.cc:466
+#, c-format
+msgid "Error parsing MD5. Offset %lu"
+msgstr "Fallu al lleer Md5. Desplazamientu %lu"
+
+#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Esti nun ye un ficheru DEB vlidu, falta'l miembru '%s'"
+
+#: apt-inst/deb/debfile.cc:50
+#, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
+msgstr "Esti nun ye un ficheru DEB vlidu, falta'l miembru '%s', '%s' o '%s'"
+
+#: apt-inst/deb/debfile.cc:110
+#, c-format
+msgid "Couldn't change to %s"
+msgstr "Nun fui a camudar a %s"
+
+#: apt-inst/deb/debfile.cc:140
+msgid "Internal error, could not locate member"
+msgstr "Fallu internu, nun fui a atopar el miembru"
+
+#: apt-inst/deb/debfile.cc:173
+msgid "Failed to locate a valid control file"
+msgstr "Nun fui a atopar un ficheru de control vlidu"
+
+#: apt-inst/deb/debfile.cc:258
+msgid "Unparsable control file"
+msgstr "Ficheru de control inanalizable"
+
+#: methods/cdrom.cc:114
+#, c-format
+msgid "Unable to read the cdrom database %s"
+msgstr "Nun se pudo lleer la base datos %s del CD-ROM"
+
+#: methods/cdrom.cc:123
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
+msgstr ""
+"Por favor usa apt-cdrom pa facer qu'APT reconoza esti CD. apt-get update nun "
+"se puede usar p'amestar CDs nuevos"
+
+#: methods/cdrom.cc:131
+msgid "Wrong CD-ROM"
+msgstr "CD-ROM malu"
+
+#: methods/cdrom.cc:166
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr "Nun se pudo desmontar el CD-ROM de %s; puede que se tea usando ent."
+
+#: methods/cdrom.cc:171
+msgid "Disk not found."
+msgstr "Nun s'atopa'l discu."
+
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
+msgid "File not found"
+msgstr "Nun s'atopa'l ficheru."
+
+#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
+#: methods/rred.cc:234 methods/rred.cc:243
+msgid "Failed to stat"
+msgstr "Fall al lleer"
+
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+msgid "Failed to set modification time"
+msgstr "Nun se pudo afitar la hora de modificacin"
+
+#: methods/file.cc:44
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "URI malu, los URIS llocales nun pueden entamar por //"
+
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:162
+msgid "Logging in"
+msgstr "Entrando"
+
+#: methods/ftp.cc:168
+msgid "Unable to determine the peer name"
+msgstr "Nun se pudo determinar el nome del par"
+
+#: methods/ftp.cc:173
+msgid "Unable to determine the local name"
+msgstr "Nun se pudo determinar el nome llocal"
+
+#: methods/ftp.cc:204 methods/ftp.cc:232
+#, c-format
+msgid "The server refused the connection and said: %s"
+msgstr "El sirvidor refug la conexn, y dixo: %s"
+
+#: methods/ftp.cc:210
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "L'usuariu (USER) fall; el sirvidor dixo: %s"
+
+#: methods/ftp.cc:217
+#, c-format
+msgid "PASS failed, server said: %s"
+msgstr "La contrasea (PASS) fall; el sirvidor dixo: %s"
+
+#: methods/ftp.cc:237
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
+msgstr ""
+"Especificse un sirvidor proxy pero non un script d'entrada, Acquire::ftp::"
+"ProxyLogin ta baleru."
+
+#: methods/ftp.cc:265
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "Fall la orde '%s' del guin d'entrada; el sirvidor dixo: %s"
+
+#: methods/ftp.cc:291
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "La triba (TYPE) fall; el sirvidor dixo: %s"
+
+#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+msgid "Connection timeout"
+msgstr "Gandi'l tiempu de conexn"
+
+#: methods/ftp.cc:335
+msgid "Server closed the connection"
+msgstr "El sirvidor zarr la conexn"
+
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+msgid "Read error"
+msgstr "Fallu de llectura"
+
+#: methods/ftp.cc:345 methods/rsh.cc:197
+msgid "A response overflowed the buffer."
+msgstr "Una rempuesta revirti'l buffer."
+
+#: methods/ftp.cc:362 methods/ftp.cc:374
+msgid "Protocol corruption"
+msgstr "Corrupcin del protocolu"
+
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+msgid "Write error"
+msgstr "Fallu d'escritura"
+
+#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+msgid "Could not create a socket"
+msgstr "Nun se pudo crear un socket"
+
+#: methods/ftp.cc:698
+msgid "Could not connect data socket, connection timed out"
+msgstr "Nun se pudo coneutar el zcalu de datos; gandi'l tiempu de conexn"
+
+#: methods/ftp.cc:704
+msgid "Could not connect passive socket."
+msgstr "Nun se pudo coneutar un socket pasivu."
+
+#: methods/ftp.cc:722
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "getaddrinfo nun pudo obtener un zcalu oyente"
+
+#: methods/ftp.cc:736
+msgid "Could not bind a socket"
+msgstr "Nun se pudo enllazar con un socket"
+
+#: methods/ftp.cc:740
+msgid "Could not listen on the socket"
+msgstr "Nun se pudo escuchar nel socket"
+
+#: methods/ftp.cc:747
+msgid "Could not determine the socket's name"
+msgstr "Nun se pudo determinar el nome del socket"
+
+#: methods/ftp.cc:779
+msgid "Unable to send PORT command"
+msgstr "Nun se pudo mandar la orde PORT"
+
+#: methods/ftp.cc:789
+#, c-format
+msgid "Unknown address family %u (AF_*)"
+msgstr "Direicin de familia %u desconocida (AF_*)"
+
+#: methods/ftp.cc:798
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "EPRT fall; el sirvidor dixo: %s"
+
+#: methods/ftp.cc:818
+msgid "Data socket connect timed out"
+msgstr "Gandi'l tiempu de conexn col zcalu de datos"
+
+#: methods/ftp.cc:825
+msgid "Unable to accept connection"
+msgstr "Nun se pudo aceptar la conexn"
+
+#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+msgid "Problem hashing file"
+msgstr "Hebo un problema al xenerar el hash del ficheru"
+
+#: methods/ftp.cc:877
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "Nun se pudo descargar el ficheru; el sirvidor dixo '%s'"
+
+#: methods/ftp.cc:892 methods/rsh.cc:322
+msgid "Data socket timed out"
+msgstr "Gandi'l tiempu del zcalu de datos"
+
+#: methods/ftp.cc:922
+#, c-format
+msgid "Data transfer failed, server said '%s'"
+msgstr "Fall la tresferencia de datos; el sirvidor dixo '%s'"
+
+#. Get the files information
+#: methods/ftp.cc:997
+msgid "Query"
+msgstr "Consulta"
+
+#: methods/ftp.cc:1109
+msgid "Unable to invoke "
+msgstr "Nun se pudo invocar "
+
+#: methods/connect.cc:70
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Coneutando a %s (%s)"
+
+#: methods/connect.cc:81
+#, c-format
+msgid "[IP: %s %s]"
+msgstr "[IP: %s %s]"
+
+#: methods/connect.cc:90
+#, c-format
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "Nun se pudo crear un socket pa %s (f=%u t=%u p=%u)"
+
+#: methods/connect.cc:96
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "Nun se pudo coneutar a %s:%s (%s)."
+
+#: methods/connect.cc:104
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Nun se pudo coneutar a %s:%s (%s); expir'l tiempu de conexn"
+
+#: methods/connect.cc:119
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr "Nun se pudo coneutar a %s:%s (%s)."
+
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:147 methods/rsh.cc:425
+#, c-format
+msgid "Connecting to %s"
+msgstr "Coneutando a %s"
+
+#: methods/connect.cc:165 methods/connect.cc:184
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "Nun se pudo resolver '%s'"
+
+#: methods/connect.cc:190
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "Fallu temporal al resolver '%s'"
+
+#: methods/connect.cc:193
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i)"
+msgstr "Daqu raru pas resolviendo '%s:%s' (%i)"
+
+#: methods/connect.cc:240
+#, c-format
+msgid "Unable to connect to %s %s:"
+msgstr "Nun se pudo coneutar a %s %s:"
+
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Nun se pudo acceder al aniellu de claves '%s'"
+
+#: methods/gpgv.cc:101
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+msgstr ""
+"E: Llista d'argumentos d'Acquire::gpgv::Options demasiao llarga. Colando."
+
+#: methods/gpgv.cc:205
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr ""
+"Fallu internu: Robla bona, pero nun se pudo determinar la so gella dixital?!"
+
+#: methods/gpgv.cc:210
+msgid "At least one invalid signature was encountered."
+msgstr "Atopse polo menos una robla mala."
+
+#: methods/gpgv.cc:214
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+msgstr "Nun se pudo executar '%s' pa verificar la robla (ta instalu gpgv?)"
+
+#: methods/gpgv.cc:219
+msgid "Unknown error executing gpgv"
+msgstr "Fallu desconocu al executar gpgv"
+
+#: methods/gpgv.cc:250
+msgid "The following signatures were invalid:\n"
+msgstr "Les siguientes robles nun valieron:\n"
+
+#: methods/gpgv.cc:257
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr ""
+"Les robles siguiente nun se pudieron verificar porque la to llave pblica "
+"nun ta a mano:\n"
+
+#: methods/gzip.cc:64
+#, c-format
+msgid "Couldn't open pipe for %s"
+msgstr "Nun se pudo abrir una tubera pa %s"
+
+#: methods/gzip.cc:109
+#, c-format
+msgid "Read error from %s process"
+msgstr "Fallu de llectura dende'l procesu %s"
+
+#: methods/http.cc:377
+msgid "Waiting for headers"
+msgstr "Esperando les testeres"
+
+#: methods/http.cc:523
+#, c-format
+msgid "Got a single header line over %u chars"
+msgstr "Obtvose una sola llinia de testera penriba de %u carauteres"
+
+#: methods/http.cc:531
+msgid "Bad header line"
+msgstr "Fallu na llinia testera"
+
+#: methods/http.cc:550 methods/http.cc:557
+msgid "The HTTP server sent an invalid reply header"
+msgstr "El sirvidor HTTP mand una testera incorreuta de rempuesta"
+
+#: methods/http.cc:586
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr "El sirvidor HTTP mand una testera incorreuta de Content-Length"
+
+#: methods/http.cc:601
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr "El sirvidor HTTP mand una testera incorreuta de Content-Range"
+
+#: methods/http.cc:603
+msgid "This HTTP server has broken range support"
+msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance"
+
+#: methods/http.cc:627
+msgid "Unknown date format"
+msgstr "Formatu de data desconocu"
+
+#: methods/http.cc:774
+msgid "Select failed"
+msgstr "Fall la escoyeta"
+
+#: methods/http.cc:779
+msgid "Connection timed out"
+msgstr "Gandi'l tiempu de conexn"
+
+#: methods/http.cc:802
+msgid "Error writing to output file"
+msgstr "Fallu al escribir nel ficheru de salida"
+
+#: methods/http.cc:833
+msgid "Error writing to file"
+msgstr "Fallu al escribir nel ficheru"
+
+#: methods/http.cc:861
+msgid "Error writing to the file"
+msgstr "Fallu al escribir nel ficheru"
+
+#: methods/http.cc:875
+msgid "Error reading from server. Remote end closed connection"
+msgstr "Fallu al lleer nel sirvidor. El llau remotu zarr la conexn."
+
+#: methods/http.cc:877
+msgid "Error reading from server"
+msgstr "Fallu al lleer nel sirvidor"
+
+#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+msgid "Failed to truncate file"
+msgstr "Fall al francer el ficheru"
+
+#: methods/http.cc:1105
+msgid "Bad header data"
+msgstr "Datos de testera incorreutos"
+
+#: methods/http.cc:1122 methods/http.cc:1177
+msgid "Connection failed"
+msgstr "Fallo la conexn"
+
+#: methods/http.cc:1229
+msgid "Internal error"
+msgstr "Fallu internu"
+
+#: apt-pkg/contrib/mmap.cc:80
+msgid "Can't mmap an empty file"
+msgstr "Nun se puede facer mmap d'un ficheru baleru"
+
+#: apt-pkg/contrib/mmap.cc:85
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Nun se pudo facer mmap de %lu bytes"
+
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Dynamic MMap escos l'espaciu. Por favor aumenta'l tamau de APT::Cache-"
+"Limit. El valor actual ye : %lu. (man 5 apt.conf)"
+
+#: apt-pkg/contrib/strutl.cc:1014
+#, c-format
+msgid "Selection %s not found"
+msgstr "Escoyeta %s que nun s'atopa"
+
+#: apt-pkg/contrib/configuration.cc:439
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Triba d'abreviatura que nun se reconoz: %c"
+
+#: apt-pkg/contrib/configuration.cc:497
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Abriendo ficheros de configuracin %s"
+
+#: apt-pkg/contrib/configuration.cc:662
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Fallu de sintaxis %s:%u: Nun hai un nome al entamu del bloque."
+
+#: apt-pkg/contrib/configuration.cc:681
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Fallu de sintaxis %s:%u: Marca mal formada"
+
+#: apt-pkg/contrib/configuration.cc:698
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Fallu de sintaxis %s:%u: Puxarra extra dempus del valor"
+
+#: apt-pkg/contrib/configuration.cc:738
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr ""
+"Error de sintaxis %s:%u: Les directives pueden facese slo nel nivel cimeru"
+
+#: apt-pkg/contrib/configuration.cc:745
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Fallu de sintaxis %s:%u: Demasiaes inclusiones aeraes"
+
+#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Fallu de sintaxis %s:%u: Incluyendo dende equ"
+
+#: apt-pkg/contrib/configuration.cc:758
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Error de sintaxis %s:%u: La directiva '%s' nun ta sofitada"
+
+#: apt-pkg/contrib/configuration.cc:809
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Fallu de sintaxis %s:%u: Puxarra extra al final del ficheru"
+
+#: apt-pkg/contrib/progress.cc:153
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Fallu!"
+
+#: apt-pkg/contrib/progress.cc:155
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Fecho"
+
+#: apt-pkg/contrib/cmndline.cc:77
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "La opcin de llinia d'ordes '%c' [de %s] ye desconocida."
+
+#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
+#: apt-pkg/contrib/cmndline.cc:119
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Nun s'entiende la opcin %s de la llinia d'ordes"
+
+#: apt-pkg/contrib/cmndline.cc:124
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "La opcin %s de la llinia d'ordes nun ye un valor booleanu"
+
+#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "La opcin %s necesita un argumentu."
+
+#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Opcin %s: L'axuste del elementu de configuracin ha tener un =<val>."
+
+#: apt-pkg/contrib/cmndline.cc:234
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "La opcin %s pide un argumentu enteru, non '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:265
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opcin '%s' demasiao llarga"
+
+#: apt-pkg/contrib/cmndline.cc:298
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "El sentu %s nun s'entiende, prueba con braeru o falsu."
+
+#: apt-pkg/contrib/cmndline.cc:348
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Operacin incorreuta: %s"
+
+#: apt-pkg/contrib/cdromutl.cc:52
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Nun puede algamase informacin del puntu de montaxe %s"
+
+#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
+#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
+#, c-format
+msgid "Unable to change to %s"
+msgstr "Nun se pudo cambiar a %s"
+
+#: apt-pkg/contrib/cdromutl.cc:188
+msgid "Failed to stat the cdrom"
+msgstr "Nun se pudo montar el CD-ROM"
+
+#: apt-pkg/contrib/fileutl.cc:149
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Nun ta usndose bloquu pal ficheru de bloquu de slo llectura %s"
+
+#: apt-pkg/contrib/fileutl.cc:154
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Nun puede abrise'l ficheru de bloquu %s"
+
+#: apt-pkg/contrib/fileutl.cc:172
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Nun ta usndose bloquu pal ficheru de bloquu %s montu per nfs"
+
+#: apt-pkg/contrib/fileutl.cc:176
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Nun se pudo torgar %s"
+
+#: apt-pkg/contrib/fileutl.cc:444
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Esperaba %s pero nun taba ell"
+
+#: apt-pkg/contrib/fileutl.cc:454
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "El subprocesu %s recibi un fallu de segmentacin."
+
+#: apt-pkg/contrib/fileutl.cc:457
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "El subprocesu %s devolvi un cdigu d'error (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:459
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "El subprocesu %s termin de manera inesperada"
+
+#: apt-pkg/contrib/fileutl.cc:503
+#, c-format
+msgid "Could not open file %s"
+msgstr "Nun se pudo abrir el ficheru %s"
+
+#: apt-pkg/contrib/fileutl.cc:559
+#, c-format
+msgid "read, still have %lu to read but none left"
+msgstr "lleos, ent tena de lleer %lu pero nun queda nada"
+
+#: apt-pkg/contrib/fileutl.cc:589
+#, c-format
+msgid "write, still have %lu to write but couldn't"
+msgstr "escritos, ent tena d'escribir %lu pero nun pudo facerse"
+
+#: apt-pkg/contrib/fileutl.cc:664
+msgid "Problem closing the file"
+msgstr "Problemes zarrando'l ficheru"
+
+#: apt-pkg/contrib/fileutl.cc:670
+msgid "Problem unlinking the file"
+msgstr "Hai problemes desvenceyando'l ficheru %s"
+
+#: apt-pkg/contrib/fileutl.cc:681
+msgid "Problem syncing the file"
+msgstr "Hai problemes al sincronizar el ficheru"
+
+#: apt-pkg/pkgcache.cc:132
+msgid "Empty package cache"
+msgstr "Cach de paquetes balera."
+
+#: apt-pkg/pkgcache.cc:138
+msgid "The package cache file is corrupted"
+msgstr "El ficheru de cach de paquetes ta tollu"
+
+#: apt-pkg/pkgcache.cc:143
+msgid "The package cache file is an incompatible version"
+msgstr "El ficheru de cach de paquetes ye una versin incompatible"
+
+#: apt-pkg/pkgcache.cc:148
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "Esti APT nun soporta'l sistema de versiones '%s'"
+
+#: apt-pkg/pkgcache.cc:153
+msgid "The package cache was built for a different architecture"
+msgstr "La cach de paquetes crese pa una arquitectura estremada"
+
+#: apt-pkg/pkgcache.cc:224
+msgid "Depends"
+msgstr "Depende de"
+
+#: apt-pkg/pkgcache.cc:224
+msgid "PreDepends"
+msgstr "Predepende de"
+
+#: apt-pkg/pkgcache.cc:224
+msgid "Suggests"
+msgstr "Suxer"
+
+#: apt-pkg/pkgcache.cc:225
+msgid "Recommends"
+msgstr "Recomienda"
+
+#: apt-pkg/pkgcache.cc:225
+msgid "Conflicts"
+msgstr "En conflictu con"
+
+#: apt-pkg/pkgcache.cc:225
+msgid "Replaces"
+msgstr "Sustituye a"
+
+#: apt-pkg/pkgcache.cc:226
+msgid "Obsoletes"
+msgstr "Fai obsoletu a"
+
+#: apt-pkg/pkgcache.cc:226
+msgid "Breaks"
+msgstr "Ruempe"
+
+#: apt-pkg/pkgcache.cc:237
+msgid "important"
+msgstr "importante"
+
+#: apt-pkg/pkgcache.cc:237
+msgid "required"
+msgstr "requeru"
+
+#: apt-pkg/pkgcache.cc:237
+msgid "standard"
+msgstr "estndar"
+
+#: apt-pkg/pkgcache.cc:238
+msgid "optional"
+msgstr "opcional"
+
+#: apt-pkg/pkgcache.cc:238
+msgid "extra"
+msgstr "extra"
+
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+msgid "Building dependency tree"
+msgstr "Creando rbol de dependencies"
+
+#: apt-pkg/depcache.cc:122
+msgid "Candidate versions"
+msgstr "Versiones candidates"
+
+#: apt-pkg/depcache.cc:151
+msgid "Dependency generation"
+msgstr "Xeneracin de dependencies"
+
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+msgid "Reading state information"
+msgstr "Lleendo informacin d'estu"
+
+#: apt-pkg/depcache.cc:219
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Nun se pudo abrir el ficheru d'estu %s"
+
+#: apt-pkg/depcache.cc:225
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Fall la escritura del ficheru temporal d'estu %s"
+
+#: apt-pkg/tagfile.cc:102
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)"
+
+#: apt-pkg/tagfile.cc:189
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)"
+
+#: apt-pkg/sourcelist.cc:90
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Llinia %lu mal formada na llista d'orxenes %s (URI)"
+
+#: apt-pkg/sourcelist.cc:92
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Llinia %lu mal formada na llista d'orxenes %s (dist)"
+
+#: apt-pkg/sourcelist.cc:95
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Llinia %lu mal formada na llista d'orxenes %s (anals d'URI)"
+
+#: apt-pkg/sourcelist.cc:101
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Llinia %lu mal formada na llista d'orxenes %s (dist absoluta)"
+
+#: apt-pkg/sourcelist.cc:108
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Llinia %lu mal formada na llista d'orxenes %s (anals de dist)"
+
+#: apt-pkg/sourcelist.cc:199
+#, c-format
+msgid "Opening %s"
+msgstr "Abriendo %s"
+
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Llinia %u demasiao llarga na llista d'orgenes %s."
+
+#: apt-pkg/sourcelist.cc:236
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Llinia %u mal formada na llista d'orxenes %s (triba)"
+
+#: apt-pkg/sourcelist.cc:240
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Triba '%s' desconocida na llinia %u de la llista d'orxenes %s"
+
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
+#, c-format
+msgid "Malformed line %u in source list %s (vendor id)"
+msgstr "Llinia %u mal formada na llista d'orxenes %s (id del proveedor)"
+
+#: apt-pkg/packagemanager.cc:428
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"Esta execucin d'instalacin va requerir desaniciar temporalmente'l paquete "
+"esencial %s por un cote de Conflictos/Pre-Dependencies. Esto normalmente ye "
+"malo, pero si daveres quies facelo, activa la opcin APT::Force-LoopBreak."
+
+#: apt-pkg/pkgrecords.cc:32
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada"
+
+#: apt-pkg/algorithms.cc:248
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"El paquete %s necesita reinstalase, pero nun s'alcuentra un archivu pa el."
+
+#: apt-pkg/algorithms.cc:1107
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Error, pkgProblemResolver::Resolve xener fraaures, esto puede ser pola mor "
+"de paquetes retenos."
+
+#: apt-pkg/algorithms.cc:1109
+msgid "Unable to correct problems, you have held broken packages."
+msgstr "Nun pueden iguase los problemes; tienes paquetes fraaos retenidos."
+
+#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
+msgid ""
+"Some index files failed to download, they have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Dellos ficheros d'indiz nun pudieron descargase; ignoraronse o usaronse los "
+"antiguos nel so llugar."
+
+#: apt-pkg/acquire.cc:59
+#, c-format
+msgid "Lists directory %spartial is missing."
+msgstr "Falta'l direutoriu de llistes %spartial."
+
+#: apt-pkg/acquire.cc:63
+#, c-format
+msgid "Archive directory %spartial is missing."
+msgstr "Falt'l direutoriu d'archivos %spartial."
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:828
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Descargando ficheru %li de %li (falten %s)"
+
+#: apt-pkg/acquire.cc:830
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Descargando ficheru %li de %li"
+
+#: apt-pkg/acquire-worker.cc:110
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Nun pudo alncontrase'l controlador de mtodu %s."
+
+#: apt-pkg/acquire-worker.cc:159
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "El mtodu %s nun entam correchamente"
+
+#: apt-pkg/acquire-worker.cc:399
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Por favor, introduz el discu '%s' nel presu '%s' y calca Intro."
+
+#: apt-pkg/init.cc:124
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "El sistema d'empaquetu '%s' nun ta sofitu"
+
+#: apt-pkg/init.cc:140
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Nun pudo determinase una triba de sistema d'empaquetu afayadiza"
+
+#: apt-pkg/clean.cc:57
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nun pudo lleese %s."
+
+#: apt-pkg/srcrecords.cc:44
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Has de poner delles URIs 'fonte' nel ficheru sources.list"
+
+#: apt-pkg/cachefile.cc:71
+msgid "The package lists or status file could not be parsed or opened."
+msgstr ""
+"Nun pudieron analizase o abrise les llistes de paquetes o el ficheru d'estu."
+
+#: apt-pkg/cachefile.cc:75
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Has d'executar apt-get update pa iguar estos problemes"
+
+#: apt-pkg/policy.cc:267
+msgid "Invalid record in the preferences file, no Package header"
+msgstr ""
+"Rexistru invlidu nel ficheru de preferencies, nun hai cabecera Paquete"
+
+#: apt-pkg/policy.cc:289
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Nun s'entiende'l tipu de pin %s"
+
+#: apt-pkg/policy.cc:297
+msgid "No priority (or zero) specified for pin"
+msgstr "Nun hai priorid (o ye cero) conseada pa pin"
+
+#: apt-pkg/pkgcachegen.cc:72
+msgid "Cache has an incompatible versioning system"
+msgstr "La cach tien un sistema de versiones incompatible"
+
+#: apt-pkg/pkgcachegen.cc:115
+#, c-format
+msgid "Error occurred while processing %s (NewPackage)"
+msgstr "Hebo un error al procesar %s (NewPackage)"
+
+#: apt-pkg/pkgcachegen.cc:130
+#, c-format
+msgid "Error occurred while processing %s (UsePackage1)"
+msgstr "Hebo un error al procesar %s (UsePackage1)"
+
+#: apt-pkg/pkgcachegen.cc:164
+#, c-format
+msgid "Error occurred while processing %s (NewFileDesc1)"
+msgstr "Hebo un error al procesar %s (NewFileDesc1)"
+
+#: apt-pkg/pkgcachegen.cc:189
+#, c-format
+msgid "Error occurred while processing %s (UsePackage2)"
+msgstr "Hebo un error al procesar %s (UsePackage2)"
+
+#: apt-pkg/pkgcachegen.cc:193
+#, c-format
+msgid "Error occurred while processing %s (NewFileVer1)"
+msgstr "Hebo un error al procesar %s (NewFileVer1)"
+
+#: apt-pkg/pkgcachegen.cc:224
+#, c-format
+msgid "Error occurred while processing %s (NewVersion1)"
+msgstr "Hebo un error al procesar %s (NewVersion1)"
+
+#: apt-pkg/pkgcachegen.cc:228
+#, c-format
+msgid "Error occurred while processing %s (UsePackage3)"
+msgstr "Hebo un error al procesar %s (UsePackage3)"
+
+#: apt-pkg/pkgcachegen.cc:232
+#, c-format
+msgid "Error occurred while processing %s (NewVersion2)"
+msgstr "Hebo un error al procesar %s (NewVersion2)"
+
+#: apt-pkg/pkgcachegen.cc:256
+#, c-format
+msgid "Error occurred while processing %s (NewFileDesc2)"
+msgstr "Hebo un error al procesar %s (NewFileDesc2)"
+
+#: apt-pkg/pkgcachegen.cc:262
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Coime, perpasaste'l nmberu de nomes de paquete qu'esti APT ye a remanar."
+
+#: apt-pkg/pkgcachegen.cc:265
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Vaya, perpasaste'l nmberu de versiones coles que puede esti APT."
+
+#: apt-pkg/pkgcachegen.cc:268
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Coime, perpasaste'l nmberu de descripciones qu'esti APT ye a remanar."
+
+#: apt-pkg/pkgcachegen.cc:271
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Vaya, perpasaste'l nmberu de dependencies coles que puede esti APT."
+
+#: apt-pkg/pkgcachegen.cc:299
+#, c-format
+msgid "Error occurred while processing %s (FindPkg)"
+msgstr "Hebo un error al procesar %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:312
+#, c-format
+msgid "Error occurred while processing %s (CollectFileProvides)"
+msgstr "Hebo un error al procesar %s (CollectFileProvides)"
+
+#: apt-pkg/pkgcachegen.cc:318
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Al procesar dependencies de ficheros nun s'alcontr el paquete %s %s"
+
+#: apt-pkg/pkgcachegen.cc:690
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Nun se puede lleer la llista de paquetes d'orxenes %s"
+
+#: apt-pkg/pkgcachegen.cc:775
+msgid "Collecting File Provides"
+msgstr "Recoyendo ficheros qu'apurren"
+
+#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909
+msgid "IO Error saving source cache"
+msgstr "Fallu de E/S al grabar cach d'orxenes"
+
+#: apt-pkg/acquire-item.cc:127
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "fall'l cambiu de nome, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:401
+msgid "MD5Sum mismatch"
+msgstr "La suma MD5 nun concasa"
+
+#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426
+msgid "Hash Sum mismatch"
+msgstr "La suma hash nun concasa"
+
+#: apt-pkg/acquire-item.cc:1118
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "Nun hai clave pblica denguna disponible pa les IDs de clave darru:\n"
+
+#: apt-pkg/acquire-item.cc:1231
+#, 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 ""
+"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:1290
+#, c-format
+msgid ""
+"I wasn't able to locate file for the %s package. This might mean you need to "
+"manually fix this package."
+msgstr ""
+"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
+"necesites iguar manualmente esti paquete"
+
+#: apt-pkg/acquire-item.cc:1331
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Los ficheros d'indiz de paquetes tan corrompos. Nun hai campu Filename: pal "
+"paquete %s."
+
+#: apt-pkg/acquire-item.cc:1418
+msgid "Size mismatch"
+msgstr "El tamau nun concasa"
+
+#: apt-pkg/vendorlist.cc:66
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "El bloque de proveedor %s nun contin una buelga dixital"
+
+#: apt-pkg/cdrom.cc:529
+#, 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:538 apt-pkg/cdrom.cc:627
+msgid "Identifying.. "
+msgstr "Identificando.. "
+
+#: apt-pkg/cdrom.cc:563
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Etiqueta guardada: %s\n"
+
+#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841
+msgid "Unmounting CD-ROM...\n"
+msgstr "Desmontando l CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:590
+#, 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:608
+msgid "Unmounting CD-ROM\n"
+msgstr "Desmontando'l CD-ROM\n"
+
+#: apt-pkg/cdrom.cc:612
+msgid "Waiting for disc...\n"
+msgstr "Esperando'l discu...\n"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:620
+msgid "Mounting CD-ROM...\n"
+msgstr "Montando'l CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:638
+msgid "Scanning disc for index files..\n"
+msgstr "Buscando nel discu ficheros d'ndices...\n"
+
+#: apt-pkg/cdrom.cc:678
+#, c-format
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
+"zu signatures\n"
+msgstr ""
+"Atopu %zu indices de paquete, %zu indices de fonte, %zu indices de torna y %"
+"zu firmes\n"
+
+#: apt-pkg/cdrom.cc:715
+#, c-format
+msgid "Found label '%s'\n"
+msgstr "Atopse la etiqueta: '%s'\n"
+
+#: apt-pkg/cdrom.cc:744
+msgid "That is not a valid name, try again.\n"
+msgstr "Esi nun ye un nome vlidu; intntalo otra vuelta.\n"
+
+#: apt-pkg/cdrom.cc:760
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+"Esti discu llmase: \n"
+"'%s'\n"
+
+#: apt-pkg/cdrom.cc:764
+msgid "Copying package lists..."
+msgstr "Copiando les llistes de paquetes..."
+
+#: apt-pkg/cdrom.cc:790
+msgid "Writing new source list\n"
+msgstr "Escribiendo llista nueva d'orxenes\n"
+
+#: apt-pkg/cdrom.cc:799
+msgid "Source list entries for this disc are:\n"
+msgstr "Les entraes de la llista d'orxenes pa esti discu son:\n"
+
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr "%i rexistros escritos.\n"
+
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "%i rexistros escritos con %i ficheros de menos.\n"
+
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "%i rexistros escritos con %i ficheros mal empareyaos\n"
+
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""
+"Escribironse %i rexistros con %i ficheros perdos y %i ficheros que nun "
+"concasen\n"
+
+#: apt-pkg/deb/dpkgpm.cc:49
+#, c-format
+msgid "Installing %s"
+msgstr "Instalando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
+#, c-format
+msgid "Configuring %s"
+msgstr "Configurando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
+#, c-format
+msgid "Removing %s"
+msgstr "Desinstalando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:52
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Executando activador de post-instalacin de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:521
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Falta'l direutoriu '%s'."
+
+#: apt-pkg/deb/dpkgpm.cc:605
+#, c-format
+msgid "Preparing %s"
+msgstr "Preparando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:606
+#, c-format
+msgid "Unpacking %s"
+msgstr "Desempaquetando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:611
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Preparndose pa configurar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
+#, c-format
+msgid "Processing triggers for %s"
+msgstr "Procesando disparadores pa %s"
+
+#: apt-pkg/deb/dpkgpm.cc:617
+#, c-format
+msgid "Installed %s"
+msgstr "%s instalu"
+
+#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
+#: apt-pkg/deb/dpkgpm.cc:625
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Preparndose pa desinstalar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:628
+#, c-format
+msgid "Removed %s"
+msgstr "%s desinstalu"
+
+#: apt-pkg/deb/dpkgpm.cc:633
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Preparndose pa desinstalar dafechu %s"
+
+#: apt-pkg/deb/dpkgpm.cc:634
+#, c-format
+msgid "Completely removed %s"
+msgstr "Desinstalse dafechu %s"
+
+#: apt-pkg/deb/dpkgpm.cc:791
+msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+msgstr ""
+"Nun puede escribise nel rexistru, fall openpty() (/dev/pts nun ta "
+"montu?)\n"
+
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Nun fui quien a parchiar el ficheru"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Conexn encaboxada prematuramente"
diff --git a/po/bg.po b/po/bg.po
index 60c988119..fa835de1a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.21\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2009-01-27 12:41+0200\n"
"Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -161,7 +161,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s за %s компилиран на %s %s\n"
@@ -665,7 +665,7 @@ msgstr "Неуспех при преименуването на %s на %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Грешка при компилирането на регулярния израз - %s"
@@ -828,11 +828,11 @@ msgstr "Трябва да бъдат премахнати пакети, но п
msgid "Internal error, Ordering didn't finish"
msgstr "Вътрешна грешка, „Ordering“ не завърши"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Неуспех при заключването на директорията за изтегляне"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Списъкът с източници не можа да бъде прочетен."
@@ -864,7 +864,7 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Неуспех при определянето на свободното пространство в %s"
@@ -901,7 +901,7 @@ msgstr "Прекъсване."
msgid "Do you want to continue [Y/n]? "
msgstr "Искате ли да продължите [Y/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Неуспех при изтеглянето на %s %s\n"
@@ -910,7 +910,7 @@ msgstr "Неуспех при изтеглянето на %s %s\n"
msgid "Some files failed to download"
msgstr "Някои файлове не можаха да бъдат изтеглени"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Изтеглянето завърши в режим само на изтегляне"
@@ -1007,30 +1007,35 @@ msgstr "Не е намерена версия „%s“ на „%s“"
msgid "Selected version %s (%s) for %s\n"
msgstr "Избрана е версия %s (%s) за %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "Командата „update“ не възприема аргументи"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Неуспех при заключването на директорията със списъка на пакетите"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Следните пакети са били инсталирани автоматично и вече не са необходими:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Използвайте „apt-get autoremove“ за да ги премахнете."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1048,44 +1053,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr ""
"Следната информация може да помогне за намиране на изход от ситуацията:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Вътрешна грешка, AutoRemover счупи нещо в системата"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "Неуспех при намирането на задача %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Неуспех при намирането на пакет %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Забележете, избиране на %s за регулярен израз „%s“\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s е отбелязан като ръчно инсталиран.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1093,7 +1098,7 @@ msgstr ""
"Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или "
"укажете разрешение)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1105,118 +1110,118 @@ msgstr ""
"дистрибуция, че някои необходими пакети още не са създадени или пък\n"
"са били преместени от Incoming."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Счупени пакети"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Следните допълнителни пакети ще бъдат инсталирани:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Предложени пакети:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Препоръчвани пакети:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Изчисляване на актуализацията..."
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Неуспех"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Готово"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Неуспех при намирането на изходен код на пакет %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускане на вече изтегления файл „%s“\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Нямате достатъчно свободно пространство в %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Изтегляне на изходен код %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Неуспех при изтеглянето на някои архиви."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Командата за разпакетиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Командата за компилиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Процесът-потомък пропадна"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Трябва да укажете поне един пакет за проверка на зависимости за компилиране"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Неуспех при получаването на информация за зависимостите за компилиране на %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s няма зависимости за компилиране.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1225,7 +1230,7 @@ msgstr ""
"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
"не може да бъде намерен"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1235,32 +1240,33 @@ msgstr ""
"налични версии на пакета %s, които могат да удовлетворят изискването за "
"версия"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният "
"пакет %s е твърде нов"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Неуспех при обработката на зависимостите за компилиране"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Поддържани модули:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1276,7 +1282,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1879,7 +1885,7 @@ msgstr "Времето за установяване на връзка с гне
msgid "Unable to accept connection"
msgstr "Невъзможно е да се приеме свързването"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Проблем при хеширане на файла"
@@ -1963,44 +1969,44 @@ msgstr "Нещо лошо се случи при намирането на IP а
msgid "Unable to connect to %s %s:"
msgstr "Неуспех при свързването с %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Неуспех при достъпа до набор на ключове: „%s“"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Списъкът с аргументи от Acquire::gpgv::Options е твърде дълъг. Завършване "
"на работа."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на "
"ключа?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "Намерен е поне един невалиден подпис."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Неуспех при изпълнението на „%s“ за проверка на подписа (инсталиран ли е "
"gpgv?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Неизвестна грешка при изпълнението на gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "Следните подписи са невалидни:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2018,80 +2024,80 @@ msgstr "Неуспех при отварянето на програмен ка
msgid "Read error from %s process"
msgstr "Грешка при четене от процес %s"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Чакане на заглавни части"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Получен е един ред на заглавна част с над %u символа"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Невалиден ред на заглавна част"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Неизвестен формат на дата"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Неуспех на избора"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Допустимото време за свързване изтече"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Грешка при записа на изходен файл"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Грешка при записа на файл"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Грешка при записа на файла"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Грешка при четене от сървъра"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "Неуспех при отрязване на края на файла"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Невалидни данни на заглавната част"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Неуспех при свързването"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Вътрешна грешка"
@@ -2104,11 +2110,38 @@ msgstr "Невъзможно е да се прехвърли в паметта
msgid "Couldn't make mmap of %lu bytes"
msgstr "Неуспех при прехвърлянето в паметта на %lu байта"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Недостатъчен ресурс при налагане на файл в паметта"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Изборът %s не е намерен"
@@ -2547,7 +2580,7 @@ msgstr "Неуспех при намирането на драйвер за ме
msgid "Method %s did not start correctly"
msgstr "Методът %s не стартира правилно"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
@@ -2917,12 +2950,16 @@ msgstr "Подготовка за пълно премахване на %s"
msgid "Completely removed %s"
msgstr "%s е напълно премахнат"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Неуспех при запис в журнала, openpty() се провали (дали /dev/pts е "
"монтирана?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Неуспех при закърпване на файла"
@@ -2930,3 +2967,6 @@ msgstr "Неуспех при закърпване на файла"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Връзката прекъсна преждевременно"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Недостатъчен ресурс при налагане на файл в паметта"
diff --git a/po/bs.po b/po/bs.po
index 7073af346..3f94a8799 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2004-05-06 15:25+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -157,7 +157,7 @@ msgstr ""
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
@@ -568,7 +568,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -729,11 +729,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr ""
@@ -762,7 +762,7 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@@ -797,7 +797,7 @@ msgstr "Odustani."
msgid "Do you want to continue [Y/n]? "
msgstr "Da li želite nastaviti? [Y/n]"
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -806,7 +806,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr ""
@@ -898,30 +898,35 @@ msgstr ""
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Slijedeći NOVI paketi će biti instalirani:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -937,49 +942,49 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr ""
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ali se %s treba instalirati"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -987,152 +992,152 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Oštećeni paketi"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Predloženi paketi:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Preporučeni paketi:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Računam nadogradnju..."
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Neuspješno"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Urađeno"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Podržani moduli:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1148,7 +1153,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1687,7 +1692,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1771,39 +1776,39 @@ msgstr ""
msgid "Unable to connect to %s %s:"
msgstr "Ne mogu se povezati sa %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr ""
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1819,81 +1824,81 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Čekam na zaglavlja"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Nepoznat oblik datuma"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr ""
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
#, fuzzy
msgid "Failed to truncate file"
msgstr "Ne mogu ukloniti %s"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Povezivanje neuspješno"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Unutrašnja greška"
@@ -1906,11 +1911,38 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -2331,7 +2363,7 @@ msgstr ""
msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2685,10 +2717,14 @@ msgstr ""
msgid "Completely removed %s"
msgstr "Ne mogu ukloniti %s"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index abcaaf529..8033819e1 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,15 +1,15 @@
# Catalan translation of APT.
-# Copyright © 2002, 2003, 2004, 2005, 2006, 2008 Software in the Public Interest, Inc.
+# Copyright © 2002, 2003, 2004, 2005, 2006, 2008, 2009 Software in the Public Interest, Inc.
# Antoni Bella Perez <bella5@teleline.es>, 2002, 2003.
# Matt Bonner <mateubonet@yahoo.com>, 2003.
-# Jordi Mallach <jordi@debian.org>, 2004, 2005, 2006, 2008.
+# Jordi Mallach <jordi@debian.org>, 2004, 2005, 2006, 2008, 2009.
#
msgid ""
msgstr ""
-"Project-Id-Version: apt 0.7.20\n"
+"Project-Id-Version: apt 0.7.22\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-12-21 20:24+0100\n"
+"PO-Revision-Date: 2009-06-06 02:17+0200\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "Total de l'espai desperdiciat: "
#: cmdline/apt-cache.cc:343
msgid "Total space accounted for: "
-msgstr "Total de l'espai atribuit a: "
+msgstr "Total de l'espai atribuït a: "
#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
#, c-format
@@ -1344,7 +1344,7 @@ msgstr "Obj "
#: cmdline/acqprogress.cc:79
msgid "Get:"
-msgstr "Des:"
+msgstr "Bai:"
#: cmdline/acqprogress.cc:110
msgid "Ign "
@@ -1399,7 +1399,7 @@ msgstr ""
"\n"
"Opcions:\n"
" -h Aquest text d'ajuda.\n"
-" -s Emprar l'ordenació de fitxers font\n"
+" -s Empra l'ordenació de fitxers font\n"
" -c=? Llegeix aquest fitxer de configuració\n"
" -o=? Estableix una opció de configuració, p.ex: -o dir::cache=/tmp\n"
@@ -1414,7 +1414,7 @@ msgstr "Premeu Intro per a continuar."
#: dselect/install:91
msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr "Voleu suprimir els paquets .deb baixats previament?"
+msgstr "Voleu suprimir els paquets .deb baixats prèviament?"
#: dselect/install:101
msgid "Some errors occurred while unpacking. I'm going to configure the"
@@ -1423,7 +1423,7 @@ msgstr "S'han produït alguns errors en desempaquetar. Es configuraran"
#: dselect/install:102
msgid "packages that were installed. This may result in duplicate errors"
msgstr ""
-"els paquets que s'han instal·lat. Això pot resultar en errors duplicacats"
+"els paquets que s'han instal·lat. Això pot resultar en errors duplicats"
#: dselect/install:103
msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1469,7 +1469,7 @@ msgstr "Signatura de l'arxiu no vàlida"
#: apt-inst/contrib/arfile.cc:78
msgid "Error reading archive member header"
-msgstr "S'ha produït un rrror en llegir la capçalera del membre de l'arxiu"
+msgstr "S'ha produït un error en llegir la capçalera del membre de l'arxiu"
#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
@@ -1614,7 +1614,7 @@ msgstr "S'està llegint la llista de paquets"
#: apt-inst/deb/dpkgdb.cc:176
#, c-format
msgid "Failed to change to the admin dir %sinfo"
-msgstr "No s'ha pogut canviar al directori d'admininstració %sinfo"
+msgstr "No s'ha pogut canviar al directori d'administració %sinfo"
#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
#: apt-inst/deb/dpkgdb.cc:444
@@ -1817,7 +1817,7 @@ msgstr "Una resposta ha desbordat la memòria temporal."
#: methods/ftp.cc:362 methods/ftp.cc:374
msgid "Protocol corruption"
-msgstr "Protocol corrumput"
+msgstr "Protocol corromput"
#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
msgid "Write error"
@@ -2100,9 +2100,14 @@ msgstr "No es pot transferir un fitxer buit a memòria"
msgid "Couldn't make mmap of %lu bytes"
msgstr "No s'ha pogut crear un mapa de memòria de %lu octets"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "L'MMap dinàmic s'ha quedat sense espai"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-Limit. "
+"Valor actual: %lu. (man 5 apt.conf)"
#: apt-pkg/contrib/strutl.cc:1014
#, c-format
@@ -2147,7 +2152,7 @@ msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include niats"
#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Included from here"
-msgstr "Error sintàctic %s:%u: Inclusió des d'aqui"
+msgstr "Error sintàctic %s:%u: Inclusió des d'aquí"
#: apt-pkg/contrib/configuration.cc:758
#, c-format
@@ -2239,7 +2244,7 @@ msgstr ""
#: apt-pkg/contrib/fileutl.cc:154
#, c-format
msgid "Could not open lock file %s"
-msgstr "No es pot resoldre el fixter de blocat %s"
+msgstr "No es pot resoldre el fitxer de blocat %s"
#: apt-pkg/contrib/fileutl.cc:172
#, c-format
@@ -2321,11 +2326,11 @@ msgstr "La memòria cau de paquets fou creada per a una arquitectura diferent"
#: apt-pkg/pkgcache.cc:224
msgid "Depends"
-msgstr "Depén"
+msgstr "Depèn"
#: apt-pkg/pkgcache.cc:224
msgid "PreDepends"
-msgstr "Predepén"
+msgstr "Predepèn"
#: apt-pkg/pkgcache.cc:224
msgid "Suggests"
@@ -2858,7 +2863,7 @@ msgstr "S'està suprimint el paquet %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, c-format
msgid "Running post-installation trigger %s"
-msgstr "S'està executant el gallet de postinstal·lació %s"
+msgstr "S'està executant l'activador de postinstal·lació %s"
#: apt-pkg/deb/dpkgpm.cc:521
#, c-format
@@ -2883,7 +2888,7 @@ msgstr "S'està preparant per a configurar el paquet %s"
#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
#, c-format
msgid "Processing triggers for %s"
-msgstr "S'estan processant els gallets per al paquet %s"
+msgstr "S'estan processant els activadors per al paquet %s"
#: apt-pkg/deb/dpkgpm.cc:617
#, c-format
@@ -2925,12 +2930,26 @@ msgstr "No s'ha pogut aplicar el pedaç al fitxer"
msgid "Connection closed prematurely"
msgstr "La connexió s'ha tancat prematurament"
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-"
-#~ "Limit. Valor actual: %lu. (man 5 apt.conf)"
+#~ msgid "No source package '%s' picking '%s' instead\n"
+#~ msgstr "No hi ha cap paquet font «%s», es selecciona «%s» en el seu lloc\n"
+
+#~ msgid "%lid %lih %limin %lis"
+#~ msgstr "%lid %lih %limin %lis"
+
+#~ msgid "%lih %limin %lis"
+#~ msgstr "%lih %limin %lis"
+
+#~ msgid "%limin %lis"
+#~ msgstr "limin %lis"
+
+#~ msgid "%lis"
+#~ msgstr "%lis"
+
+#~ msgid "Not locked"
+#~ msgstr "No blocat"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "L'MMap dinàmic s'ha quedat sense espai"
#~ msgid "Release file expired, ignoring %s (valid until %s)"
#~ msgstr "El fitxer Release ha caducat, s'està ignorant %s (vàlid fins a %s)"
diff --git a/po/cs.po b/po/cs.po
index 61df72d70..69c1d9e0d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2008-11-16 18:05+0100\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -156,7 +156,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pro %s zkompilován na %s %s\n"
@@ -650,7 +650,7 @@ msgstr "Selhalo přejmenování %s na %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba při kompilaci regulárního výrazu - %s"
@@ -811,11 +811,11 @@ msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
msgid "Internal error, Ordering didn't finish"
msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Nemohu zamknout adresář pro stahování"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Nelze přečíst seznam zdrojů."
@@ -845,7 +845,7 @@ msgstr "Po této operaci bude na disku použito dalších %sB.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po této operaci bude na disku uvolněno %sB.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nemohu určit volné místo v %s"
@@ -882,7 +882,7 @@ msgstr "Přerušeno."
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokračovat [Y/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Selhalo stažení %s %s\n"
@@ -891,7 +891,7 @@ msgstr "Selhalo stažení %s %s\n"
msgid "Some files failed to download"
msgstr "Některé soubory nemohly být staženy"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Stahování dokončeno v režimu pouze stáhnout"
@@ -988,30 +988,35 @@ msgstr "Verze „%s“ pro „%s“ nebyla nalezena"
msgid "Selected version %s (%s) for %s\n"
msgstr "Vybraná verze %s (%s) pro %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "Příkaz update neakceptuje žádné argumenty"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Nemohu uzamknout list adresář"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Neměli bychom mazat věci, nemůžu spustit AutoRemover"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Pro jejich odstranění použijte „apt-get autoremove“."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1029,43 +1034,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Vnitřní chyba, AutoRemover pokazil věci"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "Nemohu najít úlohu %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Nemohu najít balík %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Pozn: vybírám %s pro regulární výraz „%s“\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s nastaven jako instalovaný ručně.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Pro opravení následujících můžete spustit „apt-get -f install“:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1073,7 +1078,7 @@ msgstr ""
"Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo "
"navrhněte řešení)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1084,124 +1089,124 @@ msgstr ""
"nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n"
"vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Poškozené balíky"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Následující extra balíky budou instalovány:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Doporučované balíky:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Propočítávám aktualizaci... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Selhalo"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nemohu najít zdrojový balík pro %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Přeskakuji dříve stažený soubor „%s“\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Na %s nemáte dostatek volného místa"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Stáhnout zdroj %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Stažení některých archivů selhalo."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Příkaz pro rozbalení „%s“ selhal.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Zkontrolujte, zda je nainstalován balíček „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Příkaz pro sestavení „%s“ selhal.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Synovský proces selhal"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti "
"pro sestavení"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nemohu získat závislosti pro sestavení %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žádné závislosti pro sestavení.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1210,31 +1215,32 @@ msgstr ""
"%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku "
"%s, která odpovídá požadavku na verzi"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Selhalo splnění %s závislosti pro %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti pro sestavení %s nemohly být splněny."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Chyba při zpracování závislostí pro sestavení"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1250,7 +1256,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1845,7 +1851,7 @@ msgstr "Spojení datového socketu vypršelo"
msgid "Unable to accept connection"
msgstr "Nemohu přijmout spojení"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hashováním souboru"
@@ -1929,39 +1935,39 @@ msgstr "Něco hodně ošklivého se přihodilo při zjišťování „%s:%s“ (
msgid "Unable to connect to %s %s:"
msgstr "Nemohu se připojit k %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Nemohu přistoupit ke klíčence: „%s“"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Seznam argumentů Acquire::gpgv::Options je příliš dlouhý. Končím."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "Byl zaznamenán nejméně jeden neplatný podpis. "
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Nepodařilo se spustit „%s“ pro ověření podpisu (je gpgv nainstalováno?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Neznámá chyba při spouštění gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "Následující podpisy jsou neplatné:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1979,80 +1985,80 @@ msgstr "Nemohu otevřít rouru pro %s"
msgid "Read error from %s process"
msgstr "Chyba čtení z procesu %s"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Čekám na hlavičky"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Získal jsem jednu řádku hlavičky přes %u znaků"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Chybná hlavička"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "Http server poslal neplatnou hlavičku odpovědi"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http server poslal neplatnou hlavičku Content-Length"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http server poslal neplatnou hlavičku Content-Range"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má porouchanou podporu rozsahů"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Neznámý formát data"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Výběr selhal"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Čas spojení vypršel"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupního souboru"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Chyba čtení ze serveru"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "Nelze zmenšit soubor"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Špatné datové záhlaví"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Spojení selhalo"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Vnitřní chyba"
@@ -2065,11 +2071,38 @@ msgstr "Nemohu provést mmap prázdného souboru"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nešlo mmapovat %lu bajtů"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Dynamickému MMapu došlo místo"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Výběr %s nenalezen"
@@ -2496,7 +2529,7 @@ msgstr "Ovladač metody %s nemohl být nalezen."
msgid "Method %s did not start correctly"
msgstr "Metoda %s nebyla spuštěna správně"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Vložte prosím disk nazvaný „%s“ do mechaniky „%s“ a stiskněte enter."
@@ -2860,10 +2893,14 @@ msgstr "Připravuji úplné odstranění %s"
msgid "Completely removed %s"
msgstr "Kompletně odstraněn %s"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Nelze zapsat log, volání openpty() selhalo (/dev/pts není připojen?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Nemohu záplatovat soubor"
@@ -2872,6 +2909,9 @@ msgstr "Nemohu záplatovat soubor"
msgid "Connection closed prematurely"
msgstr "Spojení bylo předčasně ukončeno"
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Dynamickému MMapu došlo místo"
+
#~ msgid ""
#~ "Since you only requested a single operation it is extremely likely that\n"
#~ "the package is simply not installable and a bug report against\n"
diff --git a/po/cy.po b/po/cy.po
index 441f24951..59ef4ed09 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2005-06-06 13:46+0100\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -174,7 +174,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
@@ -680,7 +680,7 @@ msgstr "Methwyd ailenwi %s at %s"
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
@@ -850,11 +850,11 @@ msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
msgid "Internal error, Ordering didn't finish"
msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Methwyd darllen y rhestr ffynhonellau."
@@ -883,7 +883,7 @@ msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
@@ -921,7 +921,7 @@ msgstr "Erthylu."
msgid "Do you want to continue [Y/n]? "
msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
@@ -930,7 +930,7 @@ msgstr "Methwyd cyrchu %s %s\n"
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
@@ -1030,30 +1030,35 @@ msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
msgid "Selected version %s (%s) for %s\n"
msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1069,46 +1074,46 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
#, fuzzy
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:"
# FIXME
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1117,7 +1122,7 @@ msgstr ""
"pecyn (neu penodwch ddatrys)"
# FIXME: needs commas
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1129,118 +1134,118 @@ msgstr ""
"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
"heb gael eu symud allan o Incoming."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Pecynnau wedi torri"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Pecynnau a awgrymmir:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Pecynnau a argymhellir:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
#, fuzzy
msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Methwyd"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Wedi Gorffen"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, fuzzy, c-format
msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1249,7 +1254,7 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
"s"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1258,34 +1263,34 @@ msgstr ""
"Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
"ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
"newydd"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1302,7 +1307,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1924,7 +1929,7 @@ msgstr "Goramserodd cysylltiad y soced data"
msgid "Unable to accept connection"
msgstr "Methwyd derbyn cysylltiad"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem wrth stwnshio ffeil"
@@ -2009,39 +2014,39 @@ msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Methwyd cysylltu i %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, fuzzy, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Methwyd datrys '%s'"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2057,87 +2062,87 @@ msgstr "Methwyd agor pibell ar gyfer %s"
msgid "Read error from %s process"
msgstr "Gwall darllen o broses %s"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Yn aros am benawdau"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Llinell pennawd gwael"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
#, fuzzy
msgid "The HTTP server sent an invalid reply header"
msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
-#: methods/http.cc:586
+#: methods/http.cc:588
#, fuzzy
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
-#: methods/http.cc:601
+#: methods/http.cc:603
#, fuzzy
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
-#: methods/http.cc:603
+#: methods/http.cc:605
#, fuzzy
msgid "This HTTP server has broken range support"
msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Fformat dyddiad anhysbys"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Methwyd dewis"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Goramserodd y cysylltiad"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Gwall wrth ysgrifennu at ffeil"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Gwall wrth ysgrifennu at y ffeil"
-#: methods/http.cc:875
+#: methods/http.cc:883
#, fuzzy
msgid "Error reading from server. Remote end closed connection"
msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Gwall wrth ddarllen o'r gweinydd"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
#, fuzzy
msgid "Failed to truncate file"
msgstr "Methwyd ysgrifennu ffeil %s"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
#, fuzzy
msgid "Bad header data"
msgstr "Data pennawd gwael"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Methodd y cysylltiad"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Gwall mewnol"
@@ -2150,11 +2155,38 @@ msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Methwyd gwneud mmap() efo %lu beit"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Ni chanfuwyd y dewis %s"
@@ -2597,7 +2629,7 @@ msgstr "Methwyd canfod y gyrrydd dull %s."
msgid "Method %s did not start correctly"
msgstr "Ni gychwynodd y dull %s yn gywir"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2969,10 +3001,14 @@ msgstr "Yn agor y ffeil cyfluniad %s"
msgid "Completely removed %s"
msgstr "Methwyd dileu %s"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
#, fuzzy
msgid "Could not patch file"
diff --git a/po/da.po b/po/da.po
index cb07fcbe7..ef7e358bd 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2007-09-06 21:40+0200\n"
"Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
"Language-Team: Danish\n"
@@ -162,49 +162,13 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s oversat %s %s\n"
#: cmdline/apt-cache.cc:1721
#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| " apt-cache [options] add file1 [file2 ...]\n"
-#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| " add - Add a package file to the source cache\n"
-#| " gencaches - Build both the package and source cache\n"
-#| " showpkg - Show some general information for a single package\n"
-#| " showsrc - Show source records\n"
-#| " stats - Show some basic statistics\n"
-#| " dump - Show the entire file in a terse form\n"
-#| " dumpavail - Print an available file to stdout\n"
-#| " unmet - Show unmet dependencies\n"
-#| " search - Search the package list for a regex pattern\n"
-#| " show - Show a readable record for the package\n"
-#| " depends - Show raw dependency information for a package\n"
-#| " rdepends - Show reverse dependency information for a package\n"
-#| " pkgnames - List the names of all packages\n"
-#| " dotty - Generate package graphs for GraphViz\n"
-#| " xvcg - Generate package graphs for xvcg\n"
-#| " policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| " -h This help text.\n"
-#| " -p=? The package cache.\n"
-#| " -s=? The source cache.\n"
-#| " -q Disable progress indicator.\n"
-#| " -i Show only important deps for the unmet command.\n"
-#| " -c=? Read this configuration file\n"
-#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -695,7 +659,7 @@ msgstr "Kunne ikke omdbe %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fejl ved tolkning af regulrt udtryk - %s"
@@ -856,11 +820,11 @@ msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
msgid "Internal error, Ordering didn't finish"
msgstr "Intern fejl. Sortering blev ikke fuldfrt"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Kunne ikke lse nedhentningsmappen"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Listen med kilder kunne ikke lses."
@@ -889,7 +853,7 @@ msgstr "Efter udpakning vil %sB yderligere diskplads vre brugt.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunne ikke bestemme ledig plads i %s"
@@ -926,7 +890,7 @@ msgstr "Afbryder."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortstte [J/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Kunne ikke hente %s %s\n"
@@ -935,7 +899,7 @@ msgstr "Kunne ikke hente %s %s\n"
msgid "Some files failed to download"
msgstr "Nedhentningen af filer mislykkedes"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
@@ -1034,31 +998,36 @@ msgstr "Versionen '%s' for '%s' blev ikke fundet"
msgid "Selected version %s (%s) for %s\n"
msgstr "Valgte version %s (%s) af %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "'update'-kommandoen benytter ingen parametre"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Kunne ikke lse listemappen"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte "
"AutoRemover"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Flgende pakker blev installeret automatisk, og behves ikke lngere:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Brug 'apt-get autoremove' til at fjerne dem."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1076,43 +1045,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Intern fejl. AutoRemover delagde noget"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern fejl, AllUpgrade delagde noget"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "Kunne ikke finde opgaven %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunne ikke finde pakken %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Bemrk, vlger %s som regulrt udtryk '%s'\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "%s sat til manuelt installeret.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du kan muligvis rette det ved at kre 'apt-get -f install':"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1120,7 +1089,7 @@ msgstr ""
"Uopfyldte afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv "
"en lsning)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1131,115 +1100,115 @@ msgstr ""
"en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
"pakker endnu ikke er lavet eller gjort tilgngelige."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "delagte pakker"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Flgende yderligere pakker vil blive installeret:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Foreslede pakker:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Anbefalede pakker:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Beregner opgraderingen... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Mislykkedes"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Frdig"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern fejl. Problemlseren delagde noget"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "Du skal angive mindst n pakke at hente kildeteksten til"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunne ikke finde kildetekstpakken for %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Overspringer allerede hentet fil '%s'\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikke nok ledig plads i %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Henter kildetekst %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Nogle arkiver kunne ikke hentes."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Udpakningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Opbygningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Barneprocessen fejlede"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr "Skal angive mindst n pakke at tjekke opbygningsafhngigheder for"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen opbygningsafhngigheder.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1247,7 +1216,7 @@ msgid ""
msgstr ""
"%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1256,32 +1225,32 @@ msgstr ""
"%s-afhngigheden for %s kan ikke opfyldes, da ingen af de tilgngelige "
"udgaver af pakken %s kan tilfredsstille versions-kravene"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Kunne ikke opfylde %s-afhngigheden for %s: Den installerede pakke %s er for "
"ny"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Kunne ikke behandler opbygningsafhngighederne"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Understttede moduler:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1298,7 +1267,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1900,7 +1869,7 @@ msgstr "Tidsudlb p datasokkel-forbindelse"
msgid "Unable to accept connection"
msgstr "Kunne ikke acceptere forbindelse"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved \"hashing\" af fil"
@@ -1984,40 +1953,40 @@ msgstr "Der skete noget underligt under navneomstning af '%s:%s' (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Kunne ikke forbinde til %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Kunne ikke tilg ngleringent '%s'"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "F: Argumentlisten fra Acquire::gpgv::Options er for lang. Afslutter."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Intern fejl: Gyldig signatur, men kunne ikke afgre ngle-fingeraftryk?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "Stdte p mindst n ugyldig signatur."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Kunne ikke kre '%s' for at verificere signaturen (er gpgv installeret?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Ukendt fejl ved krsel af gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "Flgende signaturer var ugyldige:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2035,82 +2004,82 @@ msgstr "Kunne ikke bne datarr for %s"
msgid "Read error from %s process"
msgstr "Lsefejl fra %s-process"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Afventer hoveder"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fandt en enkelt linje i hovedet p over %u tegn"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Ugyldig linje i hovedet"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "http-serveren sendte et ugyldigt svarhovede"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http-serveren sendte et ugyldigt Content-Length-hovede"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http-serveren sendte et ugyldigt Content-Range-hovede"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr ""
"Denne http-servere har fejlagtig understttelse af intervaller ('ranges')"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Ukendt datoformat"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Valg mislykkedes"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Tidsudlb p forbindelsen"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Fejl ved skrivning af uddatafil"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Fejl ved skrivning til fil"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Fejl ved skrivning til filen"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "Fejl ved lsning fra serveren. Den fjerne ende lukkede forbindelsen"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Fejl ved lsning fra server"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
#, fuzzy
msgid "Failed to truncate file"
msgstr "Kunne ikke skrive filen %s"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Ugyldige hoved-data"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Forbindelsen mislykkedes"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Intern fejl"
@@ -2123,11 +2092,38 @@ msgstr "Kan ikke udfre mmap for en tom fil"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunne ikke udfre mmap for %lu byte"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Det valgte %s blev ikke fundet"
@@ -2556,7 +2552,7 @@ msgstr "Metodedriveren %s blev ikke fundet."
msgid "Method %s did not start correctly"
msgstr "Metoden %s startede ikke korrekt"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Indst disken med navnet: '%s' i drevet '%s' og tryk retur."
@@ -2921,10 +2917,14 @@ msgstr "Gr klar til at fjerne %s helt"
msgid "Completely removed %s"
msgstr "Fjernede %s helt"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Kunne ikke pfre filen %s en lap"
diff --git a/po/de.po b/po/de.po
index b416a2988..8dcd52cd8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.14\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2008-11-13 21:31+0100\n"
"Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
"Language-Team: <debian-l10n-german@lists.debian.org>\n"
@@ -158,7 +158,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s für %s, kompiliert am %s %s\n"
@@ -667,7 +667,7 @@ msgstr "Konnte %s nicht in %s umbenennen"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s"
@@ -828,11 +828,11 @@ msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
msgid "Internal error, Ordering didn't finish"
msgstr "Interner Fehler, Anordnung beendete nicht"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Kann das Downloadverzeichnis nicht sperren."
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Die Liste der Quellen konnte nicht gelesen werden."
@@ -863,7 +863,7 @@ msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Konnte freien Platz in %s nicht bestimmen"
@@ -900,7 +900,7 @@ msgstr "Abbruch."
msgid "Do you want to continue [Y/n]? "
msgstr "Möchten Sie fortfahren [J/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Konnte %s nicht holen %s\n"
@@ -909,7 +909,7 @@ msgstr "Konnte %s nicht holen %s\n"
msgid "Some files failed to download"
msgstr "Einige Dateien konnten nicht heruntergeladen werden"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv"
@@ -1009,19 +1009,24 @@ msgstr "Version »%s« für »%s« konnte nicht gefunden werden"
msgid "Selected version %s (%s) for %s\n"
msgstr "Gewählte Version %s (%s) für %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "Der Befehl »update« akzeptiert keine Argumente"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Kann das Listenverzeichnis nicht sperren"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Es soll nichts gelöscht werden, kann AutoRemover nicht starten"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1029,11 +1034,11 @@ msgstr ""
"Die folgenden Pakete wurden automatisch installiert und werden nicht länger "
"benötigt:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Verwenden Sie »apt-get autoremove«, um sie zu entfernen."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1052,44 +1057,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr ""
"Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Interner Fehler, AutoRemover hat was kaputt gemacht"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "Konnte Task %s nicht finden"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Konnte Paket %s nicht finden"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Hinweis: wähle %s für regulären Ausdruck »%s«\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s wurde als manuell installiert festgelegt.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1097,7 +1102,7 @@ msgstr ""
"Nicht erfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne "
"jegliche Pakete (oder geben Sie eine Lösung an)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1109,120 +1114,120 @@ msgstr ""
"Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n"
"erstellt wurden oder Incoming noch nicht verlassen haben."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Kaputte Pakete"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Vorgeschlagene Pakete:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Empfohlene Pakete:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Berechne Upgrade (Paketaktualisierung) ..."
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Fehlgeschlagen"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Fertig"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
"sollen"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kann Quellpaket für %s nicht finden"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Überspringe schon heruntergeladene Datei »%s«\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Sie haben nicht genug freien Platz in %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Hole Quelle %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Konnte einige Archive nicht holen."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Kindprozess fehlgeschlagen"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Es muss zumindest ein Paket angegeben werden, dessen Bau-Abhängigkeiten\n"
"überprüft werden sollen."
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Informationen zu Bau-Abhängigkeiten für %s konnten nicht gefunden werden."
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s hat keine Bau-Abhängigkeiten.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1231,7 +1236,7 @@ msgstr ""
"%s-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht gefunden "
"werden kann."
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1240,32 +1245,33 @@ msgstr ""
"%s-Abhängigkeit für %s kann nicht erfüllt werden, da keine verfügbare "
"Version von Paket %s die Versionsanforderungen erfüllen kann."
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Konnte die %s-Abhängigkeit für %s nicht erfüllen: Installiertes Paket %s ist "
"zu neu."
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Konnte die %s-Abhängigkeit für %s nicht erfüllen: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bau-Abhängigkeiten für %s konnten nicht erfüllt werden."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Verarbeitung der Bau-Abhängigkeiten fehlgeschlagen"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Unterstützte Module:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1281,7 +1287,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1895,7 +1901,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung"
msgid "Unable to accept connection"
msgstr "Kann Verbindung nicht annehmen"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf"
@@ -1981,42 +1987,42 @@ msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Kann nicht mit %s %s verbinden:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Konnte nicht auf Schlüsselring zugreifen: »%s«"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "F: Argumentliste von Acquire::gpgv::Options zu lang. Abbruch."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Interner Fehler: Gültige Signatur, aber konnte den Fingerabdruck des "
"Schlüssels nicht ermitteln?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "Mindestens eine ungültige Signatur wurde entdeckt."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Konnte »%s« zum Überprüfen der Signatur nicht ausführen (ist gpgv "
"installiert?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Unbekannter Fehler beim Ausführen von gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "Die folgenden Signaturen waren ungültig:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2035,82 +2041,82 @@ msgstr "Konnte keine Pipe (Weiterleitung) für %s öffnen"
msgid "Read error from %s process"
msgstr "Lesefehler von Prozess %s"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Warte auf Kopfzeilen"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Ungültige Kopfzeile"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "Der HTTP-Server sandte eine ungültige Antwort-Kopfzeile"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Der HTTP-Server sandte eine ungültige »Content-Length«-Kopfzeile"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Der HTTP-Server sandte eine ungültige »Content-Range«-Kopfzeile"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "Der HTTP-Server unterstützt Datei-Teilübertragung nur fehlerhaft."
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Unbekanntes Datumsformat"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Auswahl fehlgeschlagen"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Verbindung erlitt Zeitüberschreitung"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Fehler beim Schreiben der Ausgabedatei"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Fehler beim Schreiben einer Datei"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Fehler beim Schreiben der Datei"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Fehler beim Lesen vom Server: Der Server am anderen Ende hat die Verbindung "
"geschlossen"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Fehler beim Lesen vom Server"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "Konnte Datei nicht einkürzen"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Fehlerhafte Kopfzeilendaten"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Verbindung fehlgeschlagen"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Interner Fehler"
@@ -2123,11 +2129,38 @@ msgstr "Kann eine leere Datei nicht mit mmap abbilden"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Konnte kein mmap von %lu Bytes durchführen"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Kein Platz für Dynamic MMap"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Auswahl %s nicht gefunden"
@@ -2558,7 +2591,7 @@ msgstr "Der Treiber für Methode %s konnte nicht gefunden werden."
msgid "Method %s did not start correctly"
msgstr "Methode %s ist nicht korrekt gestartet"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2938,12 +2971,16 @@ msgstr "Komplettes Entfernen von %s wird vorbereitet"
msgid "Completely removed %s"
msgstr "%s vollständig entfernt"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Kann Protokoll nicht schreiben, openpty() schlug fehl (/dev/pts nicht "
"eingehangen?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Konnte Datei nicht patchen"
@@ -2952,6 +2989,9 @@ msgstr "Konnte Datei nicht patchen"
msgid "Connection closed prematurely"
msgstr "Verbindung zu früh beendet"
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Kein Platz für Dynamic MMap"
+
#~ msgid ""
#~ "Since you only requested a single operation it is extremely likely that\n"
#~ "the package is simply not installable and a bug report against\n"
diff --git a/po/dz.po b/po/dz.po
index ac2885992..3f2e11122 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: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2006-09-19 09:49+0530\n"
"Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
"Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -162,49 +162,13 @@ msgstr "%4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s་གི་དོན་ལུ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་ཡོད་པའི་%s %s\n"
#: cmdline/apt-cache.cc:1721
#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| " apt-cache [options] add file1 [file2 ...]\n"
-#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| " add - Add a package file to the source cache\n"
-#| " gencaches - Build both the package and source cache\n"
-#| " showpkg - Show some general information for a single package\n"
-#| " showsrc - Show source records\n"
-#| " stats - Show some basic statistics\n"
-#| " dump - Show the entire file in a terse form\n"
-#| " dumpavail - Print an available file to stdout\n"
-#| " unmet - Show unmet dependencies\n"
-#| " search - Search the package list for a regex pattern\n"
-#| " show - Show a readable record for the package\n"
-#| " depends - Show raw dependency information for a package\n"
-#| " rdepends - Show reverse dependency information for a package\n"
-#| " pkgnames - List the names of all packages\n"
-#| " dotty - Generate package graphs for GraphViz\n"
-#| " xvcg - Generate package graphs for xvcg\n"
-#| " policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| " -h This help text.\n"
-#| " -p=? The package cache.\n"
-#| " -s=? The source cache.\n"
-#| " -q Disable progress indicator.\n"
-#| " -i Show only important deps for the unmet command.\n"
-#| " -c=? Read this configuration file\n"
-#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -700,7 +664,7 @@ msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི
msgid "Y"
msgstr "ཝའི།"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
@@ -863,11 +827,11 @@ msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏ
msgid "Internal error, Ordering didn't finish"
msgstr "ནང་འཁོད་འཛོལ་བ་ གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།"
@@ -898,7 +862,7 @@ msgstr "ཁ་སྐོང་གི་%sB་འདི་བཤུབ་པའི
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s་ནང་བར་སྟོང་"
@@ -935,7 +899,7 @@ msgstr "བར་བཤོལ་འབད།"
msgid "Do you want to continue [Y/n]? "
msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?"
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
@@ -944,7 +908,7 @@ msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བ
msgid "Some files failed to download"
msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།"
@@ -1043,30 +1007,35 @@ msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་
msgid "Selected version %s (%s) for %s\n"
msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1082,44 +1051,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "ནང་འགོད་འཛོལ་བ་ ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་`apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1127,7 +1096,7 @@ msgstr ""
"མ་ཚང་བའི་རྟེན་འབྲེལ་ ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།"
"(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)"
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1138,122 +1107,122 @@ msgstr ""
"འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་"
"འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།"
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "འབད་ཚར་ཡི།"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB་ལེན་དགོཔ་འདུག་ འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "%s་འབྱུང་ཁུངས་ལེན།\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1262,32 +1231,32 @@ msgstr ""
"%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་"
"ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་"
"སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1304,7 +1273,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1908,7 +1877,7 @@ msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ན
msgid "Unable to accept connection"
msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།"
@@ -1992,43 +1961,43 @@ msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་
msgid "Unable to connect to %s %s:"
msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "'%s'ལྡེ་འཁོར་འདི་འཛུལ་སྤྱོད་འབད་མ་ཚུགས།"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Acquire::gpgv::Options་ནང་ལས་ཀྱི་སྒྲུབ་རྟགས་ཀྱི་ཐོ་ཡིག་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག ཕྱིར་"
"འཐོན་དོ།"
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་ འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་"
"མ་ཚུགས?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།"
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2045,81 +2014,81 @@ msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འད
msgid "Read error from %s process"
msgstr "%s་ལས་སྦྱོར་ནང་ལས་འཛོལ་བ་ཚུ་ལྷག"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "མགོ་ཡིག་ཚུ་གི་དོན་ལུ་བསྒ྄ག་དོ།"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "%u་ཡིག་འབྲུ་ཚུ་གི་ལྟག་ལས་མགོ་ཡིག་རྐྱང་པ་ཅིག་ཐོབ་ཡོད།"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "མགོ་ཡིག་གི་གྲལ་ཐིག་བྱང་ཉེས།"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ནུས་མེད་ལན་གསལ་གི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "ཨེཆི་ཊི་ཊི་པི་སར་བར་འདི་གིས་ནུས་མེད་ནང་དོན་རིང་-ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ནུས་མེད་ ནང་དོན་-ཁྱབ་ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ཁྱབ་ཚད་ཀྱི་རྒྱབ་སྐྱོར་དེ་ཆད་པ་བཟོ་བཏང་ནུག"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
#, fuzzy
msgid "Failed to truncate file"
msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "ནང་འཁོད་འཛོལ་བ།"
@@ -2132,11 +2101,38 @@ msgstr "ཡིག་སྣོད་སྟོངམ་འདི་mmap་འབ
msgid "Couldn't make mmap of %lu bytes"
msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
@@ -2567,7 +2563,7 @@ msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་
msgid "Method %s did not start correctly"
msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་"
@@ -2933,10 +2929,14 @@ msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བས
msgid "Completely removed %s"
msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
#, fuzzy
msgid "Could not patch file"
diff --git a/po/el.po b/po/el.po
index ae6cf0015..f02d04f85 100644
--- a/po/el.po
+++ b/po/el.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2008-08-26 18:25+0300\n"
"Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -168,49 +168,13 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s για %s είναι μεταγλωττισμένο σε %s %s\n"
#: cmdline/apt-cache.cc:1721
#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| " apt-cache [options] add file1 [file2 ...]\n"
-#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| " add - Add a package file to the source cache\n"
-#| " gencaches - Build both the package and source cache\n"
-#| " showpkg - Show some general information for a single package\n"
-#| " showsrc - Show source records\n"
-#| " stats - Show some basic statistics\n"
-#| " dump - Show the entire file in a terse form\n"
-#| " dumpavail - Print an available file to stdout\n"
-#| " unmet - Show unmet dependencies\n"
-#| " search - Search the package list for a regex pattern\n"
-#| " show - Show a readable record for the package\n"
-#| " depends - Show raw dependency information for a package\n"
-#| " rdepends - Show reverse dependency information for a package\n"
-#| " pkgnames - List the names of all packages\n"
-#| " dotty - Generate package graphs for GraphViz\n"
-#| " xvcg - Generate package graphs for xvcg\n"
-#| " policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| " -h This help text.\n"
-#| " -p=? The package cache.\n"
-#| " -s=? The source cache.\n"
-#| " -q Disable progress indicator.\n"
-#| " -i Show only important deps for the unmet command.\n"
-#| " -c=? Read this configuration file\n"
-#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -708,7 +672,7 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "σφάλμα μεταγλωτισμου - %s"
@@ -872,11 +836,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
@@ -908,7 +872,7 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s"
@@ -945,7 +909,7 @@ msgstr "Εγκατάλειψη."
msgid "Do you want to continue [Y/n]? "
msgstr "Θέλετε να συνεχίσετε [Ν/ο]; "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Αποτυχία ανάκτησης του %s %s\n"
@@ -954,7 +918,7 @@ msgstr "Αποτυχία ανάκτησης του %s %s\n"
msgid "Some files failed to download"
msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
@@ -1056,30 +1020,35 @@ msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
msgid "Selected version %s (%s) for %s\n"
msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "Η εντολή update δεν παίρνει ορίσματα"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Αδύνατο το κλείδωμα του καταλόγου"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Δεν επιτρέπεται οποιαδήποτε διαγραφή· αδυναμία εκκίνησης του AutoRemover"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1097,43 +1066,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Εσωτερικό Σφάλμα, το AutoRemover δημιούργησε κάποιο πρόβλημα"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1141,7 +1110,7 @@ msgstr ""
"Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
"πακέτο (ή καθορίστε μια λύση)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1153,120 +1122,120 @@ msgstr ""
"διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
"μετακινηθεί από τα εισερχόμενα."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Χαλασμένα πακέτα"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Προτεινόμενα πακέτα:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Συνιστώμενα πακέτα:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Υπολογισμός της αναβάθμισης... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Απέτυχε"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Ετοιμο"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
"υλικό"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
"κωδικάτου"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Μεταφόρτωση Κωδικα %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Η απογονική διεργασία απέτυχε"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1274,7 +1243,7 @@ msgid ""
msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1283,32 +1252,33 @@ msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
"εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
"είναι νεώτερο"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Υποστηριζόμενοι Οδηγοί:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1324,7 +1294,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1924,7 +1894,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο
msgid "Unable to accept connection"
msgstr "Αδύνατη η αποδοχή συνδέσεων"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Πρόβλημα κατά το hashing του αρχείου"
@@ -2008,42 +1978,42 @@ msgstr "Κάτι παράξενο συνέβη κατά την εύρεση το
msgid "Unable to connect to %s %s:"
msgstr "Αδύνατη η σύνδεση στο %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Αδύνατη η εύρεση του συνόλου κλειδιών '%s'"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "Ε: Λίστα Ορισμάτων από Acquire::gpgv::Options πολύ μεγάλη. Έξοδος."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του "
"αποτυπώματος?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Αδυναμία εκτέλεσης του '%s' για την επαλήθευση της υπογραφής (είναι "
"εγκατεστημένο το gpgv;)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2061,82 +2031,82 @@ msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το
msgid "Read error from %s process"
msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Αναμονή επικεφαλίδων"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Ελαττωματική γραμμή επικεφαλίδας"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Άγνωστη μορφή ημερομηνίας"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Η επιλογή απέτυχε"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Λήξη χρόνου σύνδεσης"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
#, fuzzy
msgid "Failed to truncate file"
msgstr "Αποτυχία εγγραφής του αρχείου %s"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Η σύνδεση απέτυχε"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Εσωτερικό Σφάλμα"
@@ -2149,11 +2119,38 @@ msgstr "Αδύνατη η απεικόνιση mmap ενός άδειου αρχ
msgid "Couldn't make mmap of %lu bytes"
msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Η επιλογή %s δε βρέθηκε"
@@ -2587,7 +2584,7 @@ msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπι
msgid "Method %s did not start correctly"
msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2959,12 +2956,16 @@ msgstr "Προετοιμασία πλήρης αφαίρεσης του %s"
msgid "Completely removed %s"
msgstr "Το %s διαγράφηκε πλήρως"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Αδυναμία εγγραφής στο αρχείο γεγονότων, λόγω αποτυχίας του openpyt() (είναι "
"προσαρτημένο το /dev/pts;)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Αδύνατη η διόρθωση του αρχείου"
diff --git a/po/en_GB.po b/po/en_GB.po
index 0c232b979..dc854782e 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.18\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2008-11-13 11:47+0000\n"
"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
"Language-Team: en_GB <en_gb@li.org>\n"
@@ -156,7 +156,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s compiled on %s %s\n"
@@ -651,7 +651,7 @@ msgstr "Failed to rename %s to %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex compilation error - %s"
@@ -812,11 +812,11 @@ msgstr "Packages need to be removed but remove is disabled."
msgid "Internal error, Ordering didn't finish"
msgstr "Internal error, Ordering didn't finish"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Unable to lock the download directory"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "The list of sources could not be read."
@@ -845,7 +845,7 @@ msgstr "After this operation, %sB of additional disk space will be used.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "After this operation, %sB disk space will be freed.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Couldn't determine free space in %s"
@@ -882,7 +882,7 @@ msgstr "Abort."
msgid "Do you want to continue [Y/n]? "
msgstr "Do you want to continue [Y/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Failed to fetch %s %s\n"
@@ -891,7 +891,7 @@ msgstr "Failed to fetch %s %s\n"
msgid "Some files failed to download"
msgstr "Some files failed to download"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Download complete and in download only mode"
@@ -988,19 +988,24 @@ msgstr "Version ‘%s’ for ‘%s’ was not found"
msgid "Selected version %s (%s) for %s\n"
msgstr "Selected version %s (%s) for %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "The update command takes no arguments"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Unable to lock the list directory"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "We are not supposed to delete stuff, cannot start AutoRemover"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1008,11 +1013,11 @@ msgstr ""
"The following packages were automatically installed and are no longer "
"required:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Use 'apt-get autoremove' to remove them."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1030,43 +1035,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "The following information may help to resolve the situation:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Internal Error, AutoRemoved broke stuff"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internal error, AllUpgrade broke stuff"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "Couldn't find task %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Couldn't find package %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, selecting %s for regex ‘%s’\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s set to manually installed.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "You might want to run 'apt-get -f install' to correct these:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1074,7 +1079,7 @@ msgstr ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1086,116 +1091,116 @@ msgstr ""
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Broken packages"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "The following extra packages will be installed:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Suggested packages:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Recommended packages:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Calculating upgrade... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Failed"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Done"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "Internal error, problem resolver broke stuff"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "Must specify at least one package for which to fetch source"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Unable to find a source package for %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Skipping already downloaded file '%s'\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "You don't have enough free space in %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Need to get %sB/%sB of source archives.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Need to get %sB of source archives.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Fetch source %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Failed to fetch some archives."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Skipping unpack of already unpacked source in %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Unpack command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Check if the 'dpkg-dev' package is installed.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Child process failed"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Must specify at least one package for which you want to check builddeps"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Unable to get build-dependency information for %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s has no build depends.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1204,7 +1209,7 @@ msgstr ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1213,31 +1218,32 @@ msgstr ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Failed to satisfy %s dependency for %s: Installed package %s is too new"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Failed to satisfy %s dependency for %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Build-dependencies for %s could not be satisfied."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Failed to process build dependencies"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Supported modules:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1253,7 +1259,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1850,7 +1856,7 @@ msgstr "Data socket connect timed out"
msgid "Unable to accept connection"
msgstr "Unable to accept connection"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem hashing file"
@@ -1934,39 +1940,39 @@ msgstr "Something wicked happened resolving ‘%s:%s’ (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Unable to connect to %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Couldn't access keyring: '%s'"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Internal error: Good signature, but could not determine key fingerprint?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "At least one invalid signature was encountered."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "Could not execute '%s' to verify signature (is gpgv installed?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Unknown error executing gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "The following signatures were invalid:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1984,80 +1990,80 @@ msgstr "Couldn't open pipe for %s"
msgid "Read error from %s process"
msgstr "Read error from %s process"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Waiting for headers"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Got a single header line over %u chars"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Bad header line"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "The HTTP server sent an invalid reply header"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "The HTTP server sent an invalid Content-Length header"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "The HTTP server sent an invalid Content-Range header"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "This HTTP server has broken range support"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Unknown date format"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Select failed"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Connection timed out"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Error writing to output file"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Error writing to file"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Error writing to the file"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "Error reading from server. Remote end closed connection"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Error reading from server"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "Failed to truncate file"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Bad header data"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Connection failed"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Internal error"
@@ -2070,11 +2076,38 @@ msgstr "Cannot mmap an empty file"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Couldn't make mmap of %lu bytes"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Selection %s not found"
@@ -2501,7 +2534,7 @@ msgstr "The method driver %s could not be found."
msgid "Method %s did not start correctly"
msgstr "Method %s did not start correctly"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2864,10 +2897,14 @@ msgstr "Preparing to completely remove %s"
msgid "Completely removed %s"
msgstr "Completely removed %s"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Could not patch file"
@@ -2875,3 +2912,6 @@ msgstr "Could not patch file"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Connection closed prematurely"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Dynamic MMap ran out of room"
diff --git a/po/es.po b/po/es.po
index ecd6e5b75..c7a16b46d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.18\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2008-11-15 21:52+0100\n"
"Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -160,7 +160,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s compilado en %s %s\n"
@@ -666,7 +666,7 @@ msgstr "Fall el renombre de %s a %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error de compilacin de expresiones regulares - %s"
@@ -827,11 +827,11 @@ msgstr "Los paquetes necesitan eliminarse pero Remove est deshabilitado."
msgid "Internal error, Ordering didn't finish"
msgstr "Error interno, no termin el ordenamiento"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "No se puede bloquear el directorio de descarga"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "No se pudieron leer las listas de fuentes."
@@ -863,7 +863,7 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Se liberarn %sB despus de esta operacin.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "No pude determinar el espacio libre en %s"
@@ -900,7 +900,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "Desea continuar [S/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Imposible obtener %s %s\n"
@@ -909,7 +909,7 @@ msgstr "Imposible obtener %s %s\n"
msgid "Some files failed to download"
msgstr "Algunos archivos no pudieron descargarse"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en modo de slo descarga"
@@ -1006,20 +1006,25 @@ msgstr "No se encontr la versin '%s' para '%s'"
msgid "Selected version %s (%s) for %s\n"
msgstr "Versin seleccionada %s (%s) para %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "El comando de actualizacin no toma argumentos"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "No se pudo bloquear el directorio de listas"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Se supone que no vamos a eliminar cosas, no se pudo iniciar AutoRemover"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1027,11 +1032,11 @@ msgstr ""
"Se instalaron de forma automtica los siguientes paquetes y ya no son "
"necesarios."
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Utilice apt-get autoremove para eliminarlos."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1049,43 +1054,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "La siguiente informacin puede ayudar a resolver la situacin:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Error interno, AutoRemover rompi cosas"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Error Interno, AllUpgrade rompi cosas"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "No se pudo encontrar la tarea %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "No se pudo encontrar el paquete %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, seleccionando %s para la expresin regular '%s'\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "fijado %s como instalado manualmente.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1093,7 +1098,7 @@ msgstr ""
"Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o "
"especifique una solucin)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1105,119 +1110,119 @@ msgstr ""
"inestable, que algunos paquetes necesarios no han sido creados o han\n"
"sido movidos fuera de Incoming."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Se instalarn los siguientes paquetes extras:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Paquetes sugeridos:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Paquetes recomendados"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Calculando la actualizacin... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Fall"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Listo"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Error interno, el sistema de solucin de problemas rompi\n"
"algunas cosas"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "Debe especificar al menos un paquete para obtener su cdigo fuente"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "No se pudo encontrar un paquete de fuentes para %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Ignorando fichero ya descargado '%s'\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "No tiene suficiente espacio libre en %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Necesito descargar %sB/%sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Necesito descargar %sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Fuente obtenida %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "No se pudieron obtener algunos archivos."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Fall la orden de desempaquetamiento '%s'.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Compruebe que el paquete dpkg-dev est instalado.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Fall la orden de construccin '%s'.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Fall el proceso hijo"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Debe especificar al menos un paquete para verificar sus\n"
"dependencias de construccin"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "No se pudo obtener informacin de dependencias de construccin para %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no tiene dependencias de construccin.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1226,7 +1231,7 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque no se puede \n"
"encontrar el paquete %s"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1235,32 +1240,33 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque ninguna versin\n"
"disponible del paquete %s satisface los requisitos de versin"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es "
"demasiado nuevo"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "No se pudo satisfacer la dependencia %s para %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No se pudieron satisfacer las dependencias de construccin de %s."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "No se pudieron procesar las dependencias de construccin"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Mdulos soportados:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1276,7 +1282,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1881,7 +1887,7 @@ msgstr "Expir conexin a socket de datos"
msgid "Unable to accept connection"
msgstr "No pude aceptar la conexin"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Hay problemas enlazando fichero"
@@ -1965,41 +1971,41 @@ msgstr "Algo raro pas resolviendo '%s:%s' (%i)"
msgid "Unable to connect to %s %s:"
msgstr "No pude conectarme a %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "No se pudo acceder al anillo de claves: '%s'"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Lista de argumentos de Acquire::gpgv::Options demasiado larga. Terminando."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Error interno: Firma correcta, pero no se pudo determinar su huella digital?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "Se encontr al menos una firma invlida."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"No se pudo ejecutar '%s' para verificar la firma (est instalado gpgv?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Error desconocido ejecutando gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "Las siguientes firms fueron invlidas:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2017,80 +2023,80 @@ msgstr "No pude abrir una tubera para %s"
msgid "Read error from %s process"
msgstr "Error de lectura de %s procesos"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Esperando las cabeceras"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Obtuve una sola lnea de cabecera arriba de %u caracteres"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Mala lnea de cabecera"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "El servidor de http envi una cabecera de respuesta invlida"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "El servidor de http envi una cabecera de Content-Length invlida"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "El servidor de http envi una cabecera de Content-Range invlida"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "ste servidor de http tiene el soporte de alcance roto"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Formato de fecha desconocido"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Fall la seleccin"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Expir la conexin"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Error escribiendo al archivo de salida"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Error escribiendo a archivo"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Error escribiendo al archivo"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "Error leyendo del servidor, el lado remoto cerr la conexin."
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Error leyendo del servidor"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "Fall al truncar el archivo"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Mala cabecera Data"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Fallo la conexin"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Error interno"
@@ -2103,11 +2109,38 @@ msgstr "No puedo hacer mmap de un fichero vaco"
msgid "Couldn't make mmap of %lu bytes"
msgstr "No pude hacer mmap de %lu bytes"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "La funcin Dynamic MMap se qued sin espacio"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Seleccin %s no encontrada"
@@ -2542,7 +2575,7 @@ msgstr "No se pudo encontrar el mtodo %s."
msgid "Method %s did not start correctly"
msgstr "El mtodo %s no se inici correctamente"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Por favor, inserte el disco %s en la unidad %s y presione Intro"
@@ -2918,12 +2951,16 @@ msgstr "Preparndose para eliminar completamente %s"
msgid "Completely removed %s"
msgstr "Se borr completamente %s"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"No se pudo escbribir en el registro, fall la llamada a openpty() (est "
"montado /dev/pts?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "No pude parchear el fichero"
@@ -2932,6 +2969,9 @@ msgstr "No pude parchear el fichero"
msgid "Connection closed prematurely"
msgstr "La conexin se cerr prematuramente"
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "La funcin Dynamic MMap se qued sin espacio"
+
#~ msgid ""
#~ "Since you only requested a single operation it is extremely likely that\n"
#~ "the package is simply not installable and a bug report against\n"
diff --git a/po/eu.po b/po/eu.po
index 30c5c1538..1664552b5 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -2,13 +2,13 @@
# This file is put in the public domain.
#
# Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2005.
-# Piarres Beobide <pi@beobide.net>, 2005, 2006, 2007, 2008.
+# Piarres Beobide <pi@beobide.net>, 2005, 2006, 2007, 2008, 2009.
msgid ""
msgstr ""
"Project-Id-Version: apt_po_eu\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-18 10:32+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"
"MIME-Version: 1.0\n"
@@ -83,7 +83,7 @@ msgstr "Guztira bateratutako kateak: "
#: cmdline/apt-cache.cc:330
msgid "Total dependency version space: "
-msgstr "Guztira bertsio dependentzi lekua: "
+msgstr "Guztira bertsio dependentzia lekua: "
#: cmdline/apt-cache.cc:335
msgid "Total slack space: "
@@ -1299,7 +1299,7 @@ msgstr ""
" upgrade - Egin bertsio berritzea\n"
" install - Instalatu pakete berriak (paketea libc6 da, eta ez libc6.deb)\n"
" remove - Kendu paketeak\n"
-" autoremove - Automatikoki kendu erabiltzen ez diren paketeak\n"
+" autoremove - Automatikoki kendu erabiltzen ez diren paketeak\n"
" purge - Paketeak kendu eta garbitu\n"
" source - Deskargatu iturburu artxiboak\n"
" build-dep - Konfiguratu iturburu paketeen eraikitze dependentziak\n"
@@ -2082,9 +2082,14 @@ msgstr "Ezin da fitxategi huts baten mmap egin"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ezin izan da %lu byteren mmap egin"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "MMap dinamiko funtzioa leku gabe geratzen ari da"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Limit muga. Uneko "
+"balioa: %lu. (man 5 apt.conf)"
#: apt-pkg/contrib/strutl.cc:1014
#, c-format
diff --git a/po/fi.po b/po/fi.po
index f64638966..1ae7ffea3 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2008-12-11 14:52+0200\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -158,7 +158,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s laitealustalle %s käännöksen päiväys %s %s\n"
@@ -655,7 +655,7 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
msgid "Y"
msgstr "K"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Käännösvirhe lausekkeessa - %s"
@@ -816,11 +816,11 @@ msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
msgid "Internal error, Ordering didn't finish"
msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Noutokansiota ei saatu lukittua"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
@@ -850,7 +850,7 @@ msgstr "Toiminnon jälkeen käytetään %s t lisää levytilaa.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
@@ -888,7 +888,7 @@ msgstr "Keskeytä."
msgid "Do you want to continue [Y/n]? "
msgstr "Haluatko jatkaa [K/e]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Tiedoston %s nouto ei onnistunut %s\n"
@@ -897,7 +897,7 @@ msgstr "Tiedoston %s nouto ei onnistunut %s\n"
msgid "Some files failed to download"
msgstr "Joidenkin tiedostojen nouto ei onnistunut"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Nouto on valmis ja määrätty vain nouto"
@@ -994,20 +994,25 @@ msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
msgid "Selected version %s (%s) for %s\n"
msgstr "Valittiin versio %s (%s) paketille %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "Komento update ei käytä parametreja"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Luettelokansiota ei voitu lukita"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"On tarkoitus olla poistamatta mitään, joten AutoRemover:ia ei voi käynnistää"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1015,11 +1020,11 @@ msgstr ""
"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
"vaadittuja:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Poista ne komennolla \"apt-get autoremove\"."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1037,43 +1042,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Sisäinen virhe, AutoRemover rikkoi jotain"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "Tehtävää %s ei löytynyt"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1081,7 +1086,7 @@ msgstr ""
"Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
"ilmanpaketteja (tai ratkaise itse)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1092,116 +1097,116 @@ msgstr ""
"jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n"
"vielä luotu tai siirretty Incoming-kansiosta."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Rikkinäiset paketit"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Ehdotetut paketit:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Suositellut paketit:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Käsitellään päivitystä ... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Ei onnistunut"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Valmis"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "Sisäinen virhe, resolver rikkoi jotain"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "On noudettava %st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Nouda lähdekoodi %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Purkukomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Lapsiprosessi kaatui"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1209,7 +1214,7 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1218,32 +1223,33 @@ msgstr ""
"%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
"ei vastaa versioriippuvuuksia"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian "
"uusi"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Tuetut moduulit:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1259,7 +1265,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1859,7 +1865,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin"
msgid "Unable to accept connection"
msgstr "Yhteyttä ei voitu hyväksyä"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Pulmia tiedoston hajautuksessa"
@@ -1943,41 +1949,41 @@ msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Avainrengasta \"%s\" ei saatavilla"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Parametrien luettelo Acquire::gpgv::Options liian pitkä. Lopetetaan."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Sisäinen virhe: Allekirjoitus kelpaa, mutta avaimen sormenjälki tuntematon?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1995,80 +2001,80 @@ msgstr "Putkea %s ei voitu avata"
msgid "Read error from %s process"
msgstr "Prosessi %s ilmoitti lukuvirheestä"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Odotetaan otsikoita"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Virheellinen otsikkorivi"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "HTTP-palvelimen arvoaluetuki on rikki"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Tuntematon päiväysmuoto"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Select ei toiminut"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Yhteys aikakatkaistiin"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Tapahtui virhe luettaessa palvelimelta"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "Tiedoston typistäminen ei onnistunut"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Virheellinen otsikkotieto"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Yhteys ei toiminut"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Sisäinen virhe"
@@ -2081,11 +2087,38 @@ msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ei voitu tehdä %lu tavun mmap:ia"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Tila loppui kesken dynaamiselta MMap:lta"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Valintaa %s ei löydy"
@@ -2511,7 +2544,7 @@ msgstr "Menetelmän ajuria %s ei löytynyt"
msgid "Method %s did not start correctly"
msgstr "Menetelmä %s ei käynnistynyt oikein"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Pistä levy nimeltään: \"%s\" asemaan \"%s\" ja paina Enter."
@@ -2878,12 +2911,16 @@ msgstr "Valmistaudutaan poistamaan %s kokonaan"
msgid "Completely removed %s"
msgstr "%s poistettiin kokonaan"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Lokiin ei voi kirjoittaa, openpty() epäonnistui (onko /dev/pts "
"liittämättä?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Tiedostoa %s ei voitu avata"
@@ -2891,3 +2928,6 @@ msgstr "Tiedostoa %s ei voitu avata"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Yhteys katkesi ennenaikaisesti"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Tila loppui kesken dynaamiselta MMap:lta"
diff --git a/po/fr.po b/po/fr.po
index a6fe7640e..c1a1b076a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,22 +1,21 @@
-# translation of fr.po to French
# translation of apt to French
# Advanced Package Transfer - APT message translation catalog
# French messages
#
# Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004.
-# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006, 2007, 2008.
+# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006, 2007, 2008, 2009.
msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-12 22:42+0100\n"
+"PO-Revision-Date: 2009-06-02 07:36+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 0.3\n"
"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
#: cmdline/apt-cache.cc:143
@@ -166,42 +165,6 @@ msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pour %s compilé sur %s %s\n"
#: cmdline/apt-cache.cc:1721
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| " apt-cache [options] add file1 [file2 ...]\n"
-#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| " add - Add a package file to the source cache\n"
-#| " gencaches - Build both the package and source cache\n"
-#| " showpkg - Show some general information for a single package\n"
-#| " showsrc - Show source records\n"
-#| " stats - Show some basic statistics\n"
-#| " dump - Show the entire file in a terse form\n"
-#| " dumpavail - Print an available file to stdout\n"
-#| " unmet - Show unmet dependencies\n"
-#| " search - Search the package list for a regex pattern\n"
-#| " show - Show a readable record for the package\n"
-#| " depends - Show raw dependency information for a package\n"
-#| " rdepends - Show reverse dependency information for a package\n"
-#| " pkgnames - List the names of all packages\n"
-#| " dotty - Generate package graphs for GraphViz\n"
-#| " xvcg - Generate package graphs for xvcg\n"
-#| " policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| " -h This help text.\n"
-#| " -p=? The package cache.\n"
-#| " -s=? The source cache.\n"
-#| " -q Disable progress indicator.\n"
-#| " -i Show only important deps for the unmet command.\n"
-#| " -c=? Read this configuration file\n"
-#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -280,11 +243,13 @@ msgstr ""
#: cmdline/apt-cdrom.cc:78
msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr "Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »"
+msgstr ""
+"Veuillez indiquer le nom de ce disque, par exemple « Debian 2.1r1 Disk 1 »"
#: cmdline/apt-cdrom.cc:93
msgid "Please insert a Disc in the drive and press enter"
-msgstr "Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée"
+msgstr ""
+"Veuillez insérer un disque dans le lecteur et appuyez sur la touche Entrée"
#: cmdline/apt-cdrom.cc:117
msgid "Repeat this process for the rest of the CDs in your set."
@@ -360,7 +325,8 @@ msgstr "Impossible d'écrire sur %s"
#: cmdline/apt-extracttemplates.cc:310
msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
+msgstr ""
+"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
msgid "Package extension list is too long"
@@ -475,7 +441,8 @@ msgstr "Aucune sélection ne correspond"
#: ftparchive/apt-ftparchive.cc:832
#, c-format
msgid "Some files are missing in the package file group `%s'"
-msgstr "Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »"
+msgstr ""
+"Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »"
#: ftparchive/cachedb.cc:43
#, c-format
@@ -854,7 +821,8 @@ msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés
#: cmdline/apt-get.cc:782
msgid "Packages need to be removed but remove is disabled."
-msgstr "Les paquets doivent être enlevés mais la désinstallation est désactivée."
+msgstr ""
+"Les paquets doivent être enlevés mais la désinstallation est désactivée."
#: cmdline/apt-get.cc:793
msgid "Internal error, Ordering didn't finish"
@@ -888,7 +856,8 @@ msgstr "Il est nécessaire de prendre %so dans les archives.\n"
#: cmdline/apt-get.cc:847
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Après cette opération, %so d'espace disque supplémentaires seront utilisés.\n"
+msgstr ""
+"Après cette opération, %so d'espace disque supplémentaires seront utilisés.\n"
#: cmdline/apt-get.cc:850
#, c-format
@@ -959,7 +928,8 @@ msgstr ""
#: cmdline/apt-get.cc:1013
msgid "--fix-missing and media swapping is not currently supported"
-msgstr "l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
+msgstr ""
+"l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
#: cmdline/apt-get.cc:1018
msgid "Unable to correct missing packages."
@@ -1021,7 +991,8 @@ msgstr "Aucun paquet ne correspond au paquet %s"
#: cmdline/apt-get.cc:1156
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
+msgstr ""
+"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
#: cmdline/apt-get.cc:1164
#, c-format
@@ -1094,7 +1065,8 @@ msgstr "L'information suivante devrait vous aider à résoudre la situation : "
#: cmdline/apt-get.cc:1449
msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Erreur interne, l'outil de suppression automatique a cassé quelque chose."
+msgstr ""
+"Erreur interne, l'outil de suppression automatique a cassé quelque chose."
#: cmdline/apt-get.cc:1468
msgid "Internal error, AllUpgrade broke stuff"
@@ -1300,6 +1272,47 @@ msgid "Supported modules:"
msgstr "Modules reconnus :"
#: cmdline/apt-get.cc:2619
+#| msgid ""
+#| "Usage: apt-get [options] command\n"
+#| " apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+#| " apt-get [options] source pkg1 [pkg2 ...]\n"
+#| "\n"
+#| "apt-get is a simple command line interface for downloading and\n"
+#| "installing packages. The most frequently used commands are update\n"
+#| "and install.\n"
+#| "\n"
+#| "Commands:\n"
+#| " update - Retrieve new lists of packages\n"
+#| " upgrade - Perform an upgrade\n"
+#| " install - Install new packages (pkg is libc6 not libc6.deb)\n"
+#| " remove - Remove packages\n"
+#| " autoremove - Remove automatically all unused packages\n"
+#| " purge - Remove packages and config files\n"
+#| " source - Download source archives\n"
+#| " build-dep - Configure build-dependencies for source packages\n"
+#| " dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+#| " dselect-upgrade - Follow dselect selections\n"
+#| " clean - Erase downloaded archive files\n"
+#| " autoclean - Erase old downloaded archive files\n"
+#| " check - Verify that there are no broken dependencies\n"
+#| "\n"
+#| "Options:\n"
+#| " -h This help text.\n"
+#| " -q Loggable output - no progress indicator\n"
+#| " -qq No output except for errors\n"
+#| " -d Download only - do NOT install or unpack archives\n"
+#| " -s No-act. Perform ordering simulation\n"
+#| " -y Assume Yes to all queries and do not prompt\n"
+#| " -f Attempt to correct a system with broken dependencies in place\n"
+#| " -m Attempt to continue if archives are unlocatable\n"
+#| " -u Show a list of upgraded packages as well\n"
+#| " -b Build the source package after fetching it\n"
+#| " -V Show verbose version numbers\n"
+#| " -c=? Read this configuration file\n"
+#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#| "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+#| "pages for more information and options.\n"
+#| " This APT has Super Cow Powers.\n"
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1480,7 +1493,8 @@ msgstr ""
"seules les erreurs"
#: dselect/install:104
-msgid "above this message are important. Please fix them and run [I]nstall again"
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
"précédant ce message sont importantes. Veuillez les corriger et\n"
"démarrer l'[I]nstallation une nouvelle fois."
@@ -1843,7 +1857,8 @@ msgstr ""
#: methods/ftp.cc:265
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr "La commande « %s » du script de connexion a échoué, le serveur a répondu : %s"
+msgstr ""
+"La commande « %s » du script de connexion a échoué, le serveur a répondu : %s"
#: methods/ftp.cc:291
#, c-format
@@ -1880,7 +1895,8 @@ msgstr "Impossible de créer un connecteur"
#: methods/ftp.cc:698
msgid "Could not connect data socket, connection timed out"
-msgstr "Impossible de se connecter sur le port de données, délai de connexion dépassé"
+msgstr ""
+"Impossible de se connecter sur le port de données, délai de connexion dépassé"
#: methods/ftp.cc:704
msgid "Could not connect passive socket."
@@ -2017,10 +2033,12 @@ msgstr "Impossible d'accéder au porte-clés : « %s »"
#: methods/gpgv.cc:101
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon."
+msgstr ""
+"E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon."
#: methods/gpgv.cc:205
-msgid "Internal error: Good signature, but could not determine key fingerprint?!"
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erreur interne : signature correcte, mais il est impossible de déterminer "
"l'empreinte de la clé."
@@ -2148,9 +2166,15 @@ msgstr "Impossible de mapper un fichier vide en mémoire"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Impossible de réaliser un mapping de %lu octets en mémoire"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "La zone dynamique d'allocation mémoire n'a plus de place"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"La zone dynamique d'allocation mémoire (« Dynamic MMap ») n'a plus de place. "
+"Vous devriez augmenter la taille de APT::Cache-Limit, dont la valeur "
+"actuelle est de %lu (voir « man 5 apt.conf »)."
#: apt-pkg/contrib/strutl.cc:1014
#, c-format
@@ -2474,12 +2498,14 @@ msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Ligne %lu mal formée dans la liste des sources %s (distribution absolue)"
+msgstr ""
+"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)"
#: apt-pkg/sourcelist.cc:108
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)"
+msgstr ""
+"Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)"
#: apt-pkg/sourcelist.cc:199
#, c-format
@@ -2504,7 +2530,8 @@ msgstr "Le type « %s » est inconnu sur la ligne %u dans la liste des sources
#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)"
+msgstr ""
+"Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)"
#: apt-pkg/packagemanager.cc:428
#, c-format
@@ -2525,7 +2552,8 @@ msgstr "Le type de fichier d'index « %s » n'est pas accepté"
#: apt-pkg/algorithms.cc:248
#, c-format
-msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
"Le paquet %s doit être réinstallé, mais il est impossible de trouver son "
"archive."
@@ -2607,7 +2635,8 @@ msgstr "Impossible de localiser %s."
#: apt-pkg/srcrecords.cc:44
msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Vous devez insérer quelques adresses « sources » dans votre sources.list"
+msgstr ""
+"Vous devez insérer quelques adresses « sources » dans votre sources.list"
#: apt-pkg/cachefile.cc:71
msgid "The package lists or status file could not be parsed or opened."
@@ -2735,7 +2764,8 @@ msgstr "Assemblage des fichiers listés dans les champs Provides"
#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909
msgid "IO Error saving source cache"
-msgstr "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
+msgstr ""
+"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
#: apt-pkg/acquire-item.cc:127
#, c-format
@@ -2760,9 +2790,8 @@ 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 ""
-"Impossible de localiser un fichier du paquet %s. Cela signifie "
-"que vous devrez corriger ce paquet vous-même (absence "
-"d'architecture)."
+"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:1290
#, c-format
@@ -2770,12 +2799,13 @@ msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-"Impossible de localiser un fichier du paquet %s. Cela signifie "
-"que vous devrez corriger ce paquet vous-même."
+"Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
+"devrez corriger ce paquet vous-même."
#: apt-pkg/acquire-item.cc:1331
#, c-format
-msgid "The package index files are corrupted. No Filename: field for package %s."
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
"pour le paquet %s."
@@ -2979,3 +3009,23 @@ msgstr "Impossible de corriger le fichier"
msgid "Connection closed prematurely"
msgstr "Connexion fermée prématurément"
+#~ msgid "No source package '%s' picking '%s' instead\n"
+#~ msgstr "Pas de paquet source « %s ». Utilisation de « %s » à la place\n"
+
+#~ msgid "%lid %lih %limin %lis"
+#~ msgstr "%lid %lih %limin %lis"
+
+#~ msgid "%lih %limin %lis"
+#~ msgstr "%lih %limin %lis"
+
+#~ msgid "%limin %lis"
+#~ msgstr "%limin %lis"
+
+#~ msgid "%lis"
+#~ msgstr "%lis"
+
+#~ msgid "Not locked"
+#~ msgstr "Non verrouillé"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "La zone dynamique d'allocation mémoire n'a plus de place"
diff --git a/po/gl.po b/po/gl.po
index 5bd403afc..eaffc5253 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_gl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2008-12-17 22:44+0100\n"
"Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
"Language-Team: galician <proxecto@trasno.net>\n"
@@ -161,7 +161,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s compilado o %s %s\n"
@@ -666,7 +666,7 @@ msgstr "Non se puido cambiar o nome de %s a %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro na compilación da expresión regular - %s"
@@ -827,11 +827,11 @@ msgstr "Hai que eliminar paquetes pero a eliminación está desactivada."
msgid "Internal error, Ordering didn't finish"
msgstr "Erro interno, a ordeación non rematou"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Non se puido bloquear o directorio de descargas"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Non se puido ler a lista de orixes."
@@ -861,7 +861,7 @@ msgstr "Despois desta operación hanse ocupar %sB de disco adicionais.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Despois desta operación hanse liberar %sB de disco.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Non se puido determinar o espazo libre en %s"
@@ -898,7 +898,7 @@ msgstr "Abortar."
msgid "Do you want to continue [Y/n]? "
msgstr "¿Quere continuar [S/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Non se puido obter %s %s\n"
@@ -907,7 +907,7 @@ msgstr "Non se puido obter %s %s\n"
msgid "Some files failed to download"
msgstr "Non se puido descargar algúns ficheiros"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Completouse a descarga no modo de só descargas"
@@ -1006,32 +1006,37 @@ msgstr "Non se atopou a versión \"%s\" de \"%s\""
msgid "Selected version %s (%s) for %s\n"
msgstr "Escolleuse a versión %s (%s) de %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "A orde \"update\" non toma argumentos"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Non se puido bloquear o directorio de listas"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Non se supón que se deban eliminar cousas; non se pode iniciar o "
"autoeliminador"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Empregue \"apt-get autoremove\" para eliminalos."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1049,43 +1054,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "A seguinte información pode axudar a resolver a situación:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Erro interno, o autoeliminador rompeu cousas"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro interno, AllUpgrade rompeu cousas"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "Non se puido atopar a tarefa %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Non se puido atopar o paquete %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s cambiouse a instalado manualmente.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1093,7 +1098,7 @@ msgstr ""
"Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou "
"especifique unha solución)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1104,118 +1109,118 @@ msgstr ""
"unha situación imposible ou, se emprega a distribución inestable, que\n"
"algúns paquetes solicitados aínda non se crearon ou moveron de Incoming."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Hanse instalar os seguintes paquetes extra:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Paquetes suxiridos:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Paquetes recomendados:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "A calcular a actualización... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Fallou"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Rematado"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro interno, o resolvedor interno rompeu cousas"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Ten que especificar alomenos un paquete para lle descargar o código fonte"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Non se puido atopar un paquete fonte para %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Omítese o ficheiro xa descargado \"%s\"\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Non hai espazo libre de abondo en %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Hai que recibir %sB de arquivos de fonte.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Non se puido recibir algúns arquivos."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Fallou a orde de desempaquetamento \"%s\".\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Fallou a codificación de %s.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "O proceso fillo fallou"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Ten que especificar alomenos un paquete para lle comprobar as dependencias "
"de compilación"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Non se puido obter a información de dependencias de compilación de %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ten dependencias de compilación.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1224,7 +1229,7 @@ msgstr ""
"A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar "
"o paquete %s"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1233,32 +1238,33 @@ msgstr ""
"A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión "
"dispoñible do paquete %s satisfai os requirimentos de versión"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é "
"novo de máis"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Non se puideron satisfacer as dependencias de compilación de %s."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Non se puido procesar as dependencias de compilación"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Módulos soportados:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1274,7 +1280,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1877,7 +1883,7 @@ msgstr "A conexión do socket de datos esgotou o tempo"
msgid "Unable to accept connection"
msgstr "Non se pode aceptar a conexión"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema ao calcular o hash do ficheiro"
@@ -1961,43 +1967,43 @@ msgstr "Algo estraño ocorreu ao resolver \"%s:%s\" (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Non se pode conectar a %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Non se puido acceder ao chaveiro: \"%s\""
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: A lista de argumentos de Acquire:gpgv::Options é longa de máis. Sáese."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erro interno: Sinatura correcta, pero non se puido determinar a pegada "
"dixital da chave"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "Atopouse alomenos unha sinatura non válida."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Non se puido executar \"%s\" para verificar a sinatura (¿está gpgv "
"instalado?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Erro descoñecido ao executar gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "As seguintes sinaturas non eran válidas:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2015,80 +2021,80 @@ msgstr "Non se puido abrir unha canle para %s"
msgid "Read error from %s process"
msgstr "Erro de lectura do proceso %s"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "A agardar polas cabeceiras"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Recibiuse unha soa liña de cabeceira en %u caracteres"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Liña de cabeceira incorrecta"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor HTTP enviou unha cabeceira de resposta non válida"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor HTTP enviou unha cabeceira Content-Length non válida"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor HTTP enviou unha cabeceira Content-Range non válida"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "Este servidor HTTP ten un soporte de rangos roto"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Formato de data descoñecido"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Fallou a chamada a select"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "A conexión esgotou o tempo"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Erro ao escribir no ficheiro de saída"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Erro ao escribir nun ficheiro"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Erro ao escribir no ficheiro"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Erro ao ler do servidor"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "Non se puido truncar o ficheiro"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Datos da cabeceira incorrectos"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "A conexión fallou"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Erro interno"
@@ -2101,11 +2107,38 @@ msgstr "Non se pode facer mmap sobre un ficheiro baleiro"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Non se puido facer mmap de %lu bytes"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "O MMap Dinámico esgotou o espazo"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Non se atopou a selección %s"
@@ -2533,7 +2566,7 @@ msgstr "Non se puido atopar o controlador de métodos %s."
msgid "Method %s did not start correctly"
msgstr "O método %s non se iniciou correctamente"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Introduza o disco etiquetado: \"%s\" na unidade \"%s\" e prema Intro."
@@ -2903,12 +2936,16 @@ msgstr "A se preparar para eliminar %s completamente"
msgid "Completely removed %s"
msgstr "Eliminouse %s completamente"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Non se puido escribir no rexistro, a chamada a openpty() fallou (¿/dev/pts "
"non estaba montado?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Non se puido parchear o ficheiro"
@@ -2916,3 +2953,6 @@ msgstr "Non se puido parchear o ficheiro"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "A conexión pechouse prematuramente"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "O MMap Dinámico esgotou o espazo"
diff --git a/po/he.po b/po/he.po
index ef7500eef..0e5f64136 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.25\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2004-06-10 19:58+0300\n"
"Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
"Language-Team: Hebrew\n"
@@ -156,7 +156,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s בשביל %s %s קומפל על %s %s\n"
@@ -554,7 +554,7 @@ msgstr "כשלון בשינוי השם %s ל-%s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -717,11 +717,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "לא מצליח לנעול את ספרית ההורדה."
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "רשימת המקורות לא ניתנת לקריאה."
@@ -750,7 +750,7 @@ msgstr "אחרי פריסה %sB נוספים יהיו בשימוש.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "אחרי פריסה %sB נוספים ישוחררו.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "אין לך מספיק מקום פנוי ב-%s."
@@ -785,7 +785,7 @@ msgstr "בטל."
msgid "Do you want to continue [Y/n]? "
msgstr "האם אתה רוצה להמשיך? [Y/n]"
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "כשלון בהבאת %s %s\n"
@@ -794,7 +794,7 @@ msgstr "כשלון בהבאת %s %s\n"
msgid "Some files failed to download"
msgstr "כשלון בהורדת חלק מהקבצים"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "ההורדה הסתיימה במסגרת מצב הורדה בלבד."
@@ -886,30 +886,35 @@ msgstr ""
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -925,50 +930,50 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "שגיאה פנימית, כלשון ביצירת %s"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr ""
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "אבל %s הולכת להיות מותקנת"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -976,153 +981,153 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "שגיאה פנימית, כלשון ביצירת %s"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1138,7 +1143,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1675,7 +1680,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1759,39 +1764,39 @@ msgstr ""
msgid "Unable to connect to %s %s:"
msgstr ""
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr ""
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "החבילות החדשות הבאות הולכות להיות מותקנות:"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1807,81 +1812,81 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr ""
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
#, fuzzy
msgid "Failed to truncate file"
msgstr "כשלון בפענוח %s"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr ""
@@ -1894,11 +1899,38 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -2317,7 +2349,7 @@ msgstr ""
msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2668,10 +2700,14 @@ msgstr ""
msgid "Completely removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index ea8ea9aae..fe9d9bd14 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2008-05-11 14:49+0100\n"
"Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
"Language-Team: Hungarian <debian-l10n-hungarian>\n"
@@ -161,49 +161,13 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s erre: %s ekkor fordult: %s %s\n"
#: cmdline/apt-cache.cc:1721
#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| " apt-cache [options] add file1 [file2 ...]\n"
-#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| " add - Add a package file to the source cache\n"
-#| " gencaches - Build both the package and source cache\n"
-#| " showpkg - Show some general information for a single package\n"
-#| " showsrc - Show source records\n"
-#| " stats - Show some basic statistics\n"
-#| " dump - Show the entire file in a terse form\n"
-#| " dumpavail - Print an available file to stdout\n"
-#| " unmet - Show unmet dependencies\n"
-#| " search - Search the package list for a regex pattern\n"
-#| " show - Show a readable record for the package\n"
-#| " depends - Show raw dependency information for a package\n"
-#| " rdepends - Show reverse dependency information for a package\n"
-#| " pkgnames - List the names of all packages\n"
-#| " dotty - Generate package graphs for GraphViz\n"
-#| " xvcg - Generate package graphs for xvcg\n"
-#| " policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| " -h This help text.\n"
-#| " -p=? The package cache.\n"
-#| " -s=? The source cache.\n"
-#| " -q Disable progress indicator.\n"
-#| " -i Show only important deps for the unmet command.\n"
-#| " -c=? Read this configuration file\n"
-#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -695,7 +659,7 @@ msgstr "Nem sikerült átnevezni %s-t erre: %s"
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex fordítási hiba - %s"
@@ -856,11 +820,11 @@ msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyeze
msgid "Internal error, Ordering didn't finish"
msgstr "Belső hiba, a rendezés nem zárult"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Nem tudom zárolni a letöltési könyvtárat"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "A források listája olvashatatlan."
@@ -889,7 +853,7 @@ msgstr "E művelet után további %sB lemez-területetet használok fel.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "E művelet után %sB lemez-terület szabadul fel.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nem határozható meg a szabad hely itt: %s"
@@ -926,7 +890,7 @@ msgstr "Megszakítva."
msgid "Do you want to continue [Y/n]? "
msgstr "Folytatni akarod [Y/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Sikertelen letöltés: %s %s\n"
@@ -935,7 +899,7 @@ msgstr "Sikertelen letöltés: %s %s\n"
msgid "Some files failed to download"
msgstr "Néhány fájlt nem sikerült letölteni"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "A letöltés befejeződött a 'csak letöltés' módban"
@@ -1031,29 +995,34 @@ msgstr "'%s' verzió ehhez: '%s' nem található"
msgid "Selected version %s (%s) for %s\n"
msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "Az update parancsnak nincsenek argumentumai"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Nem tudom a listakönyvtárat zárolni"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Nincs törölnivaló, az AutoRemover nem indítható"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Az alábbi csomagok automatikusan települtek, de már nem kellenek:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Töröld az 'apt-get autoremove' paranccsal!"
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1071,43 +1040,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "Az alábbi információ segíthet megoldani a helyzetet:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Belső hiba, az AutoRemover sérült"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Belső hiba, AllUpgrade megsértett valamit"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "Hiányzó %s feladat"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Az alábbi csomag nem található: %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s kézi telepítésre állított.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1115,7 +1084,7 @@ msgstr ""
"Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül "
"(vagy telepítsd a függőségeket is!)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1127,118 +1096,118 @@ msgstr ""
"használod, akkor néhány igényelt csomag még nem készült el vagy ki\n"
"lett mozdítva az Incoming-ból."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Törött csomagok"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Javasolt csomagok:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Ajánlott csomagok:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Frissítés kiszámítása... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Sikertelen"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Kész"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "Belső hiba, hibafeloldó gond"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nem található forráscsomag ehhez: %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "A már letöltött '%s' fájl kihagyása\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nincs elég szabad hely itt: %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB forrás-archívumot kell letölteni.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB forrás-archívumot kell letölteni.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Forrás letöltése: %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Nem sikerült néhány archívumot letölteni."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s' kibontási parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "'%s' elkészítési parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Hiba a gyermekfolyamatnál"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni "
"kell"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nem lehet %s fordítási-függőség információját beszerezni"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nincs fordítási függősége a következőnek: %s.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1247,7 +1216,7 @@ msgstr ""
"%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem "
"található"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1256,32 +1225,33 @@ msgstr ""
"%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a "
"verzió-követelményt kielégítő elérhető verziója."
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl "
"friss."
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s "
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s építési függőségei nem elégíthetőek ki."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Nem sikerült az építési függőségeket feldolgozni"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Támogatott modulok:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1297,7 +1267,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1893,7 +1863,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időt"
msgid "Unable to accept connection"
msgstr "Nem lehet elfogadni a kapcsolatot"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probléma a fájl hash értékének meghatározásakor"
@@ -1977,38 +1947,38 @@ msgstr "Valami rossz történt '%s: %s' feloldásakor (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Sikertelen kapcsolódás ide: %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "%s kulcstartó nem érhető el"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "H: Az Acquire::gpgv::Options argumentum lista túl hosszú. Kilépek."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Belső hiba: Jó aláírás, de meghatározhatatlan kulcs ujjlenyomat?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "1 vagy több érvénytelen aláírást találtam."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "'%s' nem futtatható az aláírás ellenőrzéséhez (a gpgv telepítve van?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Ismeretlen gpgv futtatási hiba"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "Az alábbi aláírások érvénytelenek voltak:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2025,81 +1995,81 @@ msgstr "Nem lehet csövet nyitni ehhez: %s"
msgid "Read error from %s process"
msgstr "Olvasási hiba %s folyamattól"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Várakozás a fejlécekre"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Egyetlen fejléc sort kaptam, ami több mint %u karakteres"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Rossz fejléc sor"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "A http kiszolgáló egy érvénytelen válaszfejlécet küldött"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "A http kiszolgáló egy érvénytelen Content-Length fejlécet küldött"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "A http kiszolgáló egy érvénytelen Content-Range fejlécet küldött"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "Ez a http szerver támogatja a sérült tartományokat "
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Ismeretlen dátum formátum"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Sikertelen kiválasztás"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Időtúllépés a kapcsolatban"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Hiba a kimeneti fájl írásakor"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Hiba fájl írásakor"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Hiba a fájl írásakor"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Hiba a kiszolgálóról olvasáskor"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
#, fuzzy
msgid "Failed to truncate file"
msgstr "%s fájl írása sikertelen"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Rossz fejlécadat"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Sikertelen kapcsolódás"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Belső hiba"
@@ -2113,11 +2083,38 @@ msgstr "Nem lehet mmap-olni egy üres fájlt"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nem sikerült %lu bájtot mmap-olni"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "%s kiválasztás nem található"
@@ -2546,7 +2543,7 @@ msgstr "A(z) %s metódus vezérlő nem található."
msgid "Method %s did not start correctly"
msgstr "A(z) %s metódus nem indult el helyesen"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Tedd be a(z) %s címkéjű lemezt a(z) %s meghajtóba és üss entert"
@@ -2915,10 +2912,14 @@ msgstr "%s teljes eltávolítása előkészítése"
msgid "Completely removed %s"
msgstr "%s teljesen eltávolítva"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Naplózási hiba, sikertelen openpty() (a /dev/pts nincs csatolva?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "%s fájl foltozása sikertelen"
diff --git a/po/it.po b/po/it.po
index 2dc5595fe..3a494360e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,16 +1,19 @@
-# Advanced Package Transfer - APT message translation catalog
+# Italian translation of apt
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The Free Software Foundation, Inc.
+# This file is distributed under the same license as the apt package.
# Samuele Giovanni Tonon <samu@debian.org>, 2002.
+# Milo Casagrande <milo@ubuntu.com>, 2009
#
msgid ""
msgstr ""
-"Project-Id-Version: apt 0.5.5\n"
+"Project-Id-Version: apt 0.7.20\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-14 12:19+0100\n"
-"Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n"
-"Language-Team: Italian <it@li.org>\n"
+"PO-Revision-Date: 2009-06-04 13:23+0200\n"
+"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: cmdline/apt-cache.cc:143
@@ -83,7 +86,7 @@ msgstr "Totale spazio di dipendenza di versione: "
#: cmdline/apt-cache.cc:335
msgid "Total slack space: "
-msgstr "Totale spazio \"slack\": "
+msgstr "Totale spazio inutilizzato: "
#: cmdline/apt-cache.cc:343
msgid "Total space accounted for: "
@@ -92,11 +95,11 @@ msgstr "Totale spazio occupato: "
#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
#, c-format
msgid "Package file %s is out of sync."
-msgstr "Il file dei pacchetti %s non sincronizzato."
+msgstr "Il file dei pacchetti %s non è sincronizzato."
#: cmdline/apt-cache.cc:1293
msgid "You must give exactly one pattern"
-msgstr "Bisogna specificare unicamente un pattern"
+msgstr "È necessario specificare un solo modello"
#: cmdline/apt-cache.cc:1447
msgid "No packages found"
@@ -109,7 +112,7 @@ msgstr "File dei pacchetti:"
#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
-"La cache non sincronizzata, impossibile referenziare un file di pacchetti"
+"La cache non è sincronizzata, impossibile referenziare un file di pacchetti"
#: cmdline/apt-cache.cc:1532
#, c-format
@@ -119,7 +122,7 @@ msgstr "%4i %s\n"
#. Show any packages have explicit pins
#: cmdline/apt-cache.cc:1544
msgid "Pinned packages:"
-msgstr "Pacchetti con pin:"
+msgstr "Pacchetti con gancio:"
#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
msgid "(not found)"
@@ -141,7 +144,7 @@ msgstr " Candidato: "
#: cmdline/apt-cache.cc:1594
msgid " Package pin: "
-msgstr " Pin del pacchetto: "
+msgstr " Gancio del pacchetto: "
#. Show the priority tables
#: cmdline/apt-cache.cc:1603
@@ -198,24 +201,25 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
-"Utilizzo: apt-cache [opzioni] comando\n"
-" apt-cache [opzioni] add file1 [file2 ...]\n"
-" apt-cache [opzioni] showpkg pkg1 [pkg2 ...]\n"
-" apt-cache [opzioni] showsrc pkg1 [pkg2 ...]\n"
+"Uso: apt-cache [OPZIONI] COMANDO\n"
+" apt-cache [OPZIONI] add FILE1 [FILE2 ...]\n"
+" apt-cache [OPZIONI] showpkg PKG1 [PKG2 ...]\n"
+" apt-cache [OPZIONI] showsrc PKG1 [PKG2 ...]\n"
"\n"
-"apt-cache un tool di basso livello usato per manipolare \n"
-"i file di cache dei binari di APT, e cercare informazioni in questi\n"
+"apt-cache è uno strumento di basso livello usato per manipolare \n"
+"i file di cache dei binari di APT e cercare informazioni in questi\n"
"\n"
"Comandi:\n"
-" add - Aggiunge un file di pacchetti alla cache sorgente \n"
-" gencaches - Costruisce sia la cache dei pacchetti che dei sorgenti\n"
+" add - Aggiunge un file di pacchetti alla cache sorgente\n"
+" gencaches - Costruisce sia la cache dei pacchetti sia quella dei "
+"sorgenti\n"
" showpkg - Mostra informazioni generali per un singolo pacchetto\n"
" showsrc - Mostra i campi dei sorgenti\n"
" stats - Mostra alcune statistiche di base\n"
" dump - Mostra il file in forma compatta\n"
-" dumpavail - Stampa un file \"available\" in stdout\n"
+" dumpavail - Stampa un file \"available\" sullo stdout\n"
" unmet - Mostra le dipendenze non soddisfatte\n"
-" search - Cerca nella lista dei pacchetti la regex specificata\n"
+" search - Cerca nell'elenco dei pacchetti un'espressione regolare\n"
" show - Mostra un campo leggibile per il pacchetto specificato\n"
" depends - Mostra informazioni di dipendenza per un pacchetto\n"
" rdepends - Mostra informazioni di dipendenza all'incontrario per un "
@@ -226,23 +230,23 @@ msgstr ""
" policy - Mostra le preferenze adottate\n"
"\n"
"Opzioni:\n"
-" -h Questo help.\n"
-" -p=? la cache pacchetti.\n"
-" -s=? la cache sorgenti.\n"
-" -q Disabilita l'indicatore di progresso\n"
+" -h Mostra questo aiuto\n"
+" -p=? La cache dei pacchetti\n"
+" -s=? La cache dei sorgenti\n"
+" -q Disabilita l'indicatore di avanzamento\n"
" -i Mostra solo dipendenze importanti per il comando unmet\n"
" -c=? Legge come configurazione il file specificato\n"
" -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
-"Consultare le pagine del manuale apt-cache(8) e apt.conf(5) per maggiori "
-"informazioni\n"
+"Per maggiori informazioni, consultare le pagine di manuale apt-cache(8) e "
+"apt.conf(5).\n"
#: cmdline/apt-cdrom.cc:78
msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr "Si prega di dare un nome a questo disco, tipo 'Debian 2.1r1 Disk 1'"
+msgstr "Dare un nome a questo disco, tipo \"Debian 5.0 Disco 1\""
#: cmdline/apt-cdrom.cc:93
msgid "Please insert a Disc in the drive and press enter"
-msgstr "Inserire un disco nel drive e premere invio"
+msgstr "Inserire un disco nell'unità e premere Invio"
#: cmdline/apt-cdrom.cc:117
msgid "Repeat this process for the rest of the CDs in your set."
@@ -267,24 +271,23 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Utilizzo: apt-config [opzioni] comando\n"
+"Uso: apt-config [OPZIONI] COMANDO\n"
"\n"
-"apt-config un semplice programma per leggere il file di configurazione di "
-"APT\n"
+"apt-config è uno strumento per leggere il file di configurazione di APT\n"
"\n"
"Comandi:\n"
-" shell - Modalit shell\n"
+" shell - Modalità shell\n"
" dump - Mostra la configurazione\n"
"\n"
"Opzioni\n"
-" -h Questo help.\n"
-" -c=? Legge questo file di configurazione\n"
+" -h Mostra questo aiuto\n"
+" -c=? Legge come configurazione il file specificato\n"
" -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
#: cmdline/apt-extracttemplates.cc:98
#, c-format
msgid "%s not a valid DEB package."
-msgstr "%s non un pacchetto DEB valido."
+msgstr "%s non è un pacchetto DEB valido."
#: cmdline/apt-extracttemplates.cc:232
msgid ""
@@ -299,13 +302,13 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Utilizzo: apt-extracttemplates file1 [file2 ...]\n"
+"Uso: apt-extracttemplates FILE1 [FILE2 ...]\n"
"\n"
-"apt-extracttemplates un tool per estrarre configurazioni e template\n"
+"apt-extracttemplates è uno strumento per estrarre configurazioni e template\n"
"dai pacchetti debian\n"
"\n"
"Opzioni:\n"
-" -h Questo help.\n"
+" -h Mostra questo aiuto\n"
" -t Imposta la directory temporanea\n"
" -c=? Legge come configurazione il file specificato\n"
" -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
@@ -317,31 +320,31 @@ msgstr "Impossibile scrivere in %s"
#: cmdline/apt-extracttemplates.cc:310
msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Impossibile trovare una versione di debconf. Debconf installato?"
+msgstr "Impossibile trovare la versione di debconf. È installato?"
#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
msgid "Package extension list is too long"
-msgstr "L'estensione del pacchetto troppo lunga"
+msgstr "L'elenco dell'estensione del pacchetto è troppo lungo"
#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
#, c-format
msgid "Error processing directory %s"
-msgstr "Errore durante l'analisi della directory %s"
+msgstr "Errore nell'elaborare la directory %s"
#: ftparchive/apt-ftparchive.cc:251
msgid "Source extension list is too long"
-msgstr "L'estensione del sorgente troppo lunga"
+msgstr "L'elenco dell'estensione del sorgente è troppo lungo"
#: ftparchive/apt-ftparchive.cc:368
msgid "Error writing header to contents file"
-msgstr "Errore nella scrittura dell'header nel file contents"
+msgstr "Errore nella scrittura dell'intestazione nel file \"contents\""
#: ftparchive/apt-ftparchive.cc:398
#, c-format
msgid "Error processing contents %s"
-msgstr "Errore nell'analisi dei contents %s"
+msgstr "Errore nell'analisi dei \"contents\" %s"
#: ftparchive/apt-ftparchive.cc:553
msgid ""
@@ -384,46 +387,45 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option"
msgstr ""
-"Utilizzo: apt-ftparchive [opzioni] comando\n"
-"Comandi: packages pathaibinari [filedioverride [pathprefix]\n"
-" sources pathaisorgenti [filedioverride [pathprefix]\n"
-" contents path\n"
-" release path\n"
-" generate config [gruppi]\n"
-" clean config\n"
+"Uso: apt-ftparchive [OPZIONI] COMANDO\n"
+"Comandi: packages PERCORSO_AL_BINARIO [FILE_OVERRIDE [PREFISSO_PERCORSO]\n"
+" sources PERCORSO_AI_SORGENTI [FILE_OVERRIDE [PREFISSO_PERCORSO]\n"
+" contents PERCORSO\n"
+" release PERCORSO\n"
+" generate CONFIGURAZIONE [GRUPPI]\n"
+" clean CONFIGURAZIONE\n"
"\n"
"apt-ftparchive genera file di indice per gli archivi Debian. Supporta\n"
-"molti stili di generazione da completamente automatici a alternative\n"
+"molti stili di generazione da completamente automatici ad alternative\n"
"funzionali per dpkg-scanpackages e dpkg-scansources\n"
"\n"
-"apt-ftparchive genera file Packages da un albero di .deb. Il\n"
-"file Package contiene le informazioni di tutti i campi control da ogni\n"
-"pacchetto cos come l'hash MD5 e la dimensione del file. Un file override\n"
-" supportato per forzare il valore di Priorit e Sezione.\n"
+"apt-ftparchive genera file Packages da un albero di \".deb\". Il file\n"
+"Package contiene le informazioni di tutti i campi control da ogni\n"
+"pacchetto, così come l'hash MD5 e la dimensione del file. Un file override\n"
+"è supportato per forzare i valori di priorità e sezione.\n"
"\n"
-"Similarmente apt-ftparchive genera file Sources da un albero di .dscs.\n"
-"L'opzione --source-override pu essere usata per specificare un file\n"
+"Similmente, apt-ftparchive genera file Sources da un albero di .dscs.\n"
+"L'opzione --source-override può essere usata per specificare un file\n"
"di override per i sorgenti\n"
"\n"
-"I comandi 'packages' e 'sources' devono essere eseguiti nella root \n"
-"dell'albero. BinaryPath deve puntare alla base della ricerca \n"
+"I comandi \"packages\" e \"sources\" devono essere eseguiti nella root \n"
+"dell'albero. Il percorso al binario deve puntare alla base della ricerca \n"
"ricorsiva e il file override deve contenere le opzioni di override.\n"
-"Pathprefix \n"
-" aggiunto al campo filename se presente. Esempio di utilizzo \n"
-"dall'archivio debian:\n"
+"Il prefisso del percorso è aggiunto al campo filename se presente. Esempio\n"
+"di utilizzo dall'archivio Debian:\n"
" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
" dists/potato/main/binary-i386/Packages \n"
"\n"
"Opzioni:\n"
-" -h Questo help\n"
-" --md5 Controlla la generazione del MD5\n"
-" -s=? File override dei sorgenti\n"
-" -q Silenzioso\n"
-" -d=? Seleziona il database di cache opzionale\n"
-" --no-delink Abilita modalit di debug del delinking\n"
-" --contents Controlla la generazione del file contents\n"
-" -c=? Legge come configurazione il file specificato\n"
-" -o=? Imposta un'opzione arbitraria di configurazione"
+" -h Mostra questo aiuto\n"
+" --md5 Controlla la generazione dell'MD5\n"
+" -s=? File override dei sorgenti\n"
+" -q Silenzioso\n"
+" -d=? Seleziona il database di cache opzionale\n"
+" --no-delink Abilita la modalità di debug del delinking\n"
+" --contents Controlla la generazione del file \"contents\"\n"
+" -c=? Legge come configurazione il file specificato\n"
+" -o=? Imposta un'opzione arbitraria di configurazione"
#: ftparchive/apt-ftparchive.cc:759
msgid "No selections matched"
@@ -432,54 +434,57 @@ msgstr "Nessuna selezione corrisponde"
#: ftparchive/apt-ftparchive.cc:832
#, c-format
msgid "Some files are missing in the package file group `%s'"
-msgstr "Mancano alcuni file nel file group di pacchetti `%s'"
+msgstr "Mancano alcuni file nel file group di pacchetti \"%s\""
#: ftparchive/cachedb.cc:43
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB era corrotto, il file stato rinominato in %s.old"
+msgstr "Il database era danneggiato, il file è stato rinominato in %s.old"
#: ftparchive/cachedb.cc:61
#, c-format
msgid "DB is old, attempting to upgrade %s"
-msgstr "Il DB vecchio, tentativo di aggiornamento %s"
+msgstr "Il database è vecchio, tentativo di aggiornamento %s"
#: ftparchive/cachedb.cc:72
msgid ""
"DB format is invalid. If you upgraded from a older version of apt, please "
"remove and re-create the database."
msgstr ""
-"Il formato DB non valido. Se avete aggiornato da una vecchia versione di "
-"apt,rimuovete e ricreate il database."
+"Il formato del database non è valido. Se è stata aggiornata una vecchia "
+"versione di apt, rimuovere e ricreare il database."
#: ftparchive/cachedb.cc:77
#, c-format
msgid "Unable to open DB file %s: %s"
-msgstr "Impossibile aprire il file DB %s: %s"
+msgstr "Impossibile aprire il file del database %s: %s"
#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
#, c-format
msgid "Failed to stat %s"
-msgstr "Impossibile analizzare %s"
+msgstr "Impossibile eseguire stat su %s"
#: ftparchive/cachedb.cc:238
msgid "Archive has no control record"
-msgstr "L'archivio non ha un campo control"
+msgstr "L'archivio non ha un campo \"control\""
#: ftparchive/cachedb.cc:444
msgid "Unable to get a cursor"
msgstr "Impossibile ottenere un cursore"
+# (ndt) messo A per Avviso
+# Inizio con la maiuscola dopo i : perché mi sa che in molti
+# casi molte stringhe sono così
#: ftparchive/writer.cc:76
#, c-format
msgid "W: Unable to read directory %s\n"
-msgstr "W: Impossibile leggere la directory %s\n"
+msgstr "A: Impossibile leggere la directory %s\n"
#: ftparchive/writer.cc:81
#, c-format
msgid "W: Unable to stat %s\n"
-msgstr "W: Impossibile analizzare %s\n"
+msgstr "A: Impossibile eseguire stat su %s\n"
#: ftparchive/writer.cc:132
msgid "E: "
@@ -487,54 +492,54 @@ msgstr "E: "
#: ftparchive/writer.cc:134
msgid "W: "
-msgstr "W: "
+msgstr "A: "
#: ftparchive/writer.cc:141
msgid "E: Errors apply to file "
-msgstr "E: Errori applicati al file "
+msgstr "E: Gli errori si applicano al file "
#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
#, c-format
msgid "Failed to resolve %s"
-msgstr "Impossibile risolvere %s"
+msgstr "Risoluzione di %s non riuscita"
#: ftparchive/writer.cc:170
msgid "Tree walking failed"
-msgstr "Visita dell'albero fallita"
+msgstr "Visita dell'albero non riuscita"
#: ftparchive/writer.cc:195
#, c-format
msgid "Failed to open %s"
-msgstr "Impossibile aprire %s"
+msgstr "Apertura di %s non riuscita"
#: ftparchive/writer.cc:254
#, c-format
msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgstr " Delink %s [%s]\n"
#: ftparchive/writer.cc:262
#, c-format
msgid "Failed to readlink %s"
-msgstr "Impossibile eseguire readlink su %s"
+msgstr "Esecuzione di readlink su %s non riuscita"
#: ftparchive/writer.cc:266
#, c-format
msgid "Failed to unlink %s"
-msgstr "Impossibile eseguire unlink su %s"
+msgstr "Esecuzione di unlink su %s non riuscita"
#: ftparchive/writer.cc:273
#, c-format
msgid "*** Failed to link %s to %s"
-msgstr "*** Impossibile eseguire link tra %s e %s"
+msgstr "*** Collegamento di %s a %s non riuscito"
#: ftparchive/writer.cc:283
#, c-format
msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink limite di %sB raggiunto.\n"
+msgstr " Raggiunto il limite di Delink di %sB.\n"
#: ftparchive/writer.cc:387
msgid "Archive had no package field"
-msgstr "L'archivio non ha un campo package"
+msgstr "L'archivio non ha un campo \"package\""
#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
#, c-format
@@ -544,7 +549,7 @@ msgstr " %s non ha un campo override\n"
#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
#, c-format
msgid " %s maintainer is %s not %s\n"
-msgstr " %s maintainer %s non %s\n"
+msgstr " il responsabile di %s è %s non %s\n"
#: ftparchive/writer.cc:620
#, c-format
@@ -554,16 +559,16 @@ msgstr " %s non ha un campo source override\n"
#: ftparchive/writer.cc:624
#, c-format
msgid " %s has no binary override entry either\n"
-msgstr " %s non ha neppure un campo binary override\n"
+msgstr " %s non ha neppure un campo binario override\n"
#: ftparchive/contents.cc:321
#, c-format
msgid "Internal error, could not locate member %s"
-msgstr "Errore interno, impossibile trovare il campo %s"
+msgstr "Errore interno, impossibile trovare il membro %s"
#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Impossibile allocare memoria"
+msgstr "realloc - Allocazione della memoria non riuscita"
#: ftparchive/override.cc:34 ftparchive/override.cc:142
#, c-format
@@ -573,27 +578,27 @@ msgstr "Impossibile aprire %s"
#: ftparchive/override.cc:60 ftparchive/override.cc:166
#, c-format
msgid "Malformed override %s line %lu #1"
-msgstr "Override malformato %s linea %lu #1"
+msgstr "Override non corretto: file %s riga %lu #1"
#: ftparchive/override.cc:74 ftparchive/override.cc:178
#, c-format
msgid "Malformed override %s line %lu #2"
-msgstr "Override malformato %s linea %lu #2"
+msgstr "Override non corretto: file %s riga %lu #2"
#: ftparchive/override.cc:88 ftparchive/override.cc:191
#, c-format
msgid "Malformed override %s line %lu #3"
-msgstr "Override malformato %s linea %lu #3"
+msgstr "Override non corretto: file %s riga %lu #3"
#: ftparchive/override.cc:127 ftparchive/override.cc:201
#, c-format
msgid "Failed to read the override file %s"
-msgstr "Impossibile leggere il file override %s"
+msgstr "Lettura del file override %s non riuscita"
#: ftparchive/multicompress.cc:72
#, c-format
msgid "Unknown compression algorithm '%s'"
-msgstr "Algoritmo di compressione '%s' sconosciuto"
+msgstr "Algoritmo di compressione \"%s\" sconosciuto"
#: ftparchive/multicompress.cc:102
#, c-format
@@ -602,15 +607,15 @@ msgstr "L'output compresso %s necessita di un insieme di compressione"
#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
msgid "Failed to create IPC pipe to subprocess"
-msgstr "Impossibile creare un pipe IPC verso il sottoprocesso"
+msgstr "Creazione di una pipe IPC verso il sottoprocesso non riuscita"
#: ftparchive/multicompress.cc:195
msgid "Failed to create FILE*"
-msgstr "Impossibile creare FILE*"
+msgstr "Creazione di FILE* non riuscita"
#: ftparchive/multicompress.cc:198
msgid "Failed to fork"
-msgstr "Impossibile eseguire fork"
+msgstr "Fork non riuscita"
#: ftparchive/multicompress.cc:212
msgid "Compress child"
@@ -619,15 +624,15 @@ msgstr "Sottoprocesso compresso"
#: ftparchive/multicompress.cc:235
#, c-format
msgid "Internal error, failed to create %s"
-msgstr "Errore interno, impossibile creare %s"
+msgstr "Errore interno, creazione di %s non riuscita"
#: ftparchive/multicompress.cc:286
msgid "Failed to create subprocess IPC"
-msgstr "Impossibile creare un sottoprocesso IPC"
+msgstr "Creazione di un sottoprocesso IPC non riuscita"
#: ftparchive/multicompress.cc:321
msgid "Failed to exec compressor "
-msgstr "Impossibile eseguire compressor"
+msgstr "Esecuzione di compressor non riuscita"
#: ftparchive/multicompress.cc:360
msgid "decompressor"
@@ -635,11 +640,11 @@ msgstr "decompressore"
#: ftparchive/multicompress.cc:403
msgid "IO to subprocess/file failed"
-msgstr "I/O al sottoprocesso/file fallito"
+msgstr "I/O al sottoprocesso/file non riuscito"
#: ftparchive/multicompress.cc:455
msgid "Failed to read while computing MD5"
-msgstr "Impossibile leggere durante l'elaborazione MD5"
+msgstr "Lettura durante l'elaborazione MD5 non riuscita"
#: ftparchive/multicompress.cc:472
#, c-format
@@ -649,7 +654,7 @@ msgstr "Problema nell'unlink di %s"
#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
#, c-format
msgid "Failed to rename %s to %s"
-msgstr "Impossibile rinominare %s in %s"
+msgstr "Rinomina di %s in %s non riuscita"
#: cmdline/apt-get.cc:124
msgid "Y"
@@ -658,7 +663,7 @@ msgstr "S"
#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
#, c-format
msgid "Regex compilation error - %s"
-msgstr "Errore di compilazione della regex - %s"
+msgstr "Errore di compilazione dell'espressione regolare - %s"
#: cmdline/apt-get.cc:241
msgid "The following packages have unmet dependencies:"
@@ -667,7 +672,7 @@ msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
#: cmdline/apt-get.cc:331
#, c-format
msgid "but %s is installed"
-msgstr "ma %s installato"
+msgstr "ma %s è installato"
#: cmdline/apt-get.cc:333
#, c-format
@@ -676,15 +681,15 @@ msgstr "ma %s sta per essere installato"
#: cmdline/apt-get.cc:340
msgid "but it is not installable"
-msgstr "ma non installabile"
+msgstr "ma non è installabile"
#: cmdline/apt-get.cc:342
msgid "but it is a virtual package"
-msgstr "ma un pacchetto virtuale"
+msgstr "ma è un pacchetto virtuale"
#: cmdline/apt-get.cc:345
msgid "but it is not installed"
-msgstr "ma non installato"
+msgstr "ma non è installato"
#: cmdline/apt-get.cc:345
msgid "but it is not going to be installed"
@@ -696,7 +701,7 @@ msgstr " oppure"
#: cmdline/apt-get.cc:379
msgid "The following NEW packages will be installed:"
-msgstr "I seguenti pacchetti NUOVI (NEW) saranno installati:"
+msgstr "I seguenti pacchetti NUOVI saranno installati:"
#: cmdline/apt-get.cc:405
msgid "The following packages will be REMOVED:"
@@ -712,7 +717,7 @@ msgstr "I seguenti pacchetti saranno aggiornati:"
#: cmdline/apt-get.cc:469
msgid "The following packages will be DOWNGRADED:"
-msgstr "I seguenti pacchetti saranno RETROCESSI (DOWNGRADED):"
+msgstr "I seguenti pacchetti saranno RETROCESSI:"
#: cmdline/apt-get.cc:489
msgid "The following held packages will be changed:"
@@ -728,9 +733,9 @@ msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"ATTENZIONE: il seguente pacchetto ESSENZIALE sta per essere rimosso\n"
+"ATTENZIONE: i seguenti pacchetti essenziali stanno per essere rimossi.\n"
"Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa "
-"si sta facendo!"
+"si sta facendo."
#: cmdline/apt-get.cc:581
#, c-format
@@ -745,7 +750,7 @@ msgstr "%lu reinstallati, "
#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu downgraded, "
-msgstr "%lu retrocessi (downgraded), "
+msgstr "%lu retrocessi, "
#: cmdline/apt-get.cc:589
#, c-format
@@ -759,11 +764,11 @@ msgstr "%lu non completamente installati o rimossi.\n"
#: cmdline/apt-get.cc:667
msgid "Correcting dependencies..."
-msgstr "Correzione delle dipendenze in corso..."
+msgstr "Correzione delle dipendenze..."
#: cmdline/apt-get.cc:670
msgid " failed."
-msgstr " fallita."
+msgstr " non riuscita."
#: cmdline/apt-get.cc:673
msgid "Unable to correct dependencies"
@@ -780,7 +785,7 @@ msgstr " Fatto"
#: cmdline/apt-get.cc:682
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
-" consigliabile eseguire `apt-get -f install' per correggere questi problemi."
+"È utile eseguire \"apt-get -f install\" per correggere questi problemi."
#: cmdline/apt-get.cc:685
msgid "Unmet dependencies. Try using -f."
@@ -788,61 +793,62 @@ msgstr "Dipendenze non trovate. Riprovare usando -f."
#: cmdline/apt-get.cc:707
msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati!"
+msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati."
#: cmdline/apt-get.cc:711
msgid "Authentication warning overridden.\n"
-msgstr "Avviso di autenticazione disabilitato \n"
+msgstr "Avviso di autenticazione disabilitato.\n"
#: cmdline/apt-get.cc:718
msgid "Install these packages without verification [y/N]? "
-msgstr "Installare questi pacchetti senza la verifica [s/N]? "
+msgstr "Installare questi pacchetti senza verificarli [s/N]? "
#: cmdline/apt-get.cc:720
msgid "Some packages could not be authenticated"
-msgstr "Non stato possibile autenticare alcuni pacchetti"
+msgstr "Alcuni pacchetti non possono essere autenticati"
#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
msgid "There are problems and -y was used without --force-yes"
-msgstr "Sussistono dei problemi e -y stata usata senza --force-yes"
+msgstr "Si sono verificati dei problemi ed è stata usata -y senza --force-yes"
#: cmdline/apt-get.cc:773
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-"Errore interno, InstallPackages stato chiamato con un pacchetto rotto!"
+"Errore interno, InstallPackages è stato chiamato con un pacchetto "
+"danneggiato."
#: cmdline/apt-get.cc:782
msgid "Packages need to be removed but remove is disabled."
-msgstr "I pacchetti devono essere rimossi ma il remove disabilitato."
+msgstr ""
+"I pacchetti devono essere rimossi, ma l'azione di rimozione è disabilitata."
#: cmdline/apt-get.cc:793
msgid "Internal error, Ordering didn't finish"
-msgstr "Errore interno, l'ordinamento non terminato"
+msgstr "Errore interno, l'ordinamento non è stato terminato"
#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
msgid "Unable to lock the download directory"
-msgstr "Impossibile creare un lock sulla directory di download"
+msgstr "Impossibile bloccare la directory di scaricamento"
#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
-msgstr "La lista dei sorgenti non pu essere letta."
+msgstr "Impossibile leggere l'elenco dei sorgenti."
#: cmdline/apt-get.cc:834
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-"Che strano... le dimensioni non corrispondono, inviare un'email a "
-"apt@packages.debian.org"
+"Le dimensioni non corrispondono. Inviare un'email a: apt@packages.debian.org"
#: cmdline/apt-get.cc:839
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
-msgstr " necessario prendere %sB/%sB di archivi. \n"
+msgstr "È necessario scaricare %sB/%sB di archivi.\n"
#: cmdline/apt-get.cc:842
#, c-format
msgid "Need to get %sB of archives.\n"
-msgstr " necessario prendere %sB di archivi. \n"
+msgstr "È necessario scaricare %sB di archivi.\n"
#: cmdline/apt-get.cc:847
#, c-format
@@ -862,17 +868,17 @@ msgstr "Impossibile determinare lo spazio libero su %s"
#: cmdline/apt-get.cc:871
#, c-format
msgid "You don't have enough free space in %s."
-msgstr "Lo spazio libero in %s non sufficiente."
+msgstr "Spazio libero in %s insufficiente."
#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-" stata specificata la modalit Trivial Only ma questa non un'operazione "
-"triviale"
+"È stata specificata la modalità \"Trivial Only\", ma questa non è "
+"un'operazione banale."
#: cmdline/apt-get.cc:889
msgid "Yes, do as I say!"
-msgstr "SI, esegui come richiesto!"
+msgstr "Sì, esegui come da richiesta."
#: cmdline/apt-get.cc:891
#, c-format
@@ -881,8 +887,8 @@ msgid ""
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"Si sta per compiere un'azione potenzialmente pericolosa\n"
-"Per continuare scrivere la frase '%s' \n"
+"Si sta per compiere un'azione potenzialmente pericolosa.\n"
+"Per continuare scrivere la frase \"%s\"\n"
" ?] "
#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
@@ -896,57 +902,56 @@ msgstr "Continuare [S/n]? "
#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
-msgstr "Impossibile ottenere %s %s\n"
+msgstr "Impossibile recuperare %s %s\n"
#: cmdline/apt-get.cc:1002
msgid "Some files failed to download"
-msgstr "Il download di alcuni file fallito"
+msgstr "Scaricamento di alcuni file non riuscito"
#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
msgid "Download complete and in download only mode"
-msgstr "Download completato e in modalit download-only"
+msgstr "Scaricamento completato e in modalità solo scaricamento"
#: cmdline/apt-get.cc:1009
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-"Impossibile prendere alcuni archivi, forse meglio eseguire apt-get update "
-"o provare l'opzione --fix-missing"
+"Impossibile recuperare alcuni pacchetti. Potrebbe essere utile eseguire "
+"\"apt-get update\" o provare l'opzione \"--fix-missing\"."
#: cmdline/apt-get.cc:1013
msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing su media estraibili non ancora supportato"
+msgstr "--fix-missing su supporti estraibili non è ancora supportato"
#: cmdline/apt-get.cc:1018
msgid "Unable to correct missing packages."
-msgstr "Impossibile correggere i pacchetti mancanti"
+msgstr "Impossibile correggere i pacchetti mancanti."
#: cmdline/apt-get.cc:1019
msgid "Aborting install."
-msgstr "Interruzione dell'installazione in corso."
+msgstr "Interruzione dell'installazione."
#: cmdline/apt-get.cc:1053
#, c-format
msgid "Note, selecting %s instead of %s\n"
-msgstr "Nota, si sta selezionando %s al posto di %s\n"
+msgstr "Nota, viene selezionato %s al posto di %s\n"
#: cmdline/apt-get.cc:1063
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-"%s stato saltato, perch gi installato e l'aggiornamento non stato "
-"impostato.\n"
+"Viene saltato %s poiché è già installato e l'aggiornamento non è impostato.\n"
#: cmdline/apt-get.cc:1081
#, c-format
msgid "Package %s is not installed, so not removed\n"
-msgstr "Il pacchetto %s non installato, quindi non stato rimosso\n"
+msgstr "Il pacchetto %s non è installato e quindi non è stato rimosso\n"
#: cmdline/apt-get.cc:1092
#, c-format
msgid "Package %s is a virtual package provided by:\n"
-msgstr "Il pacchetto %s un pacchetto virtuale fornito da:\n"
+msgstr "Il pacchetto %s è un pacchetto virtuale fornito da:\n"
#: cmdline/apt-get.cc:1104
msgid " [Installed]"
@@ -954,7 +959,7 @@ msgstr " [Installato]"
#: cmdline/apt-get.cc:1109
msgid "You should explicitly select one to install."
-msgstr "Bisogna esplicitamente sceglierne uno da installare."
+msgstr "È necessario sceglierne uno da installare."
#: cmdline/apt-get.cc:1114
#, c-format
@@ -963,9 +968,9 @@ msgid ""
"This may mean that the package is missing, has been obsoleted, or\n"
"is only available from another source\n"
msgstr ""
-"Il pacchetto %s non ha versioni disponibili, ma nominato da un altro\n"
-"pacchetto. Questo significa che il pacchetto manca, diventato obsoleto\n"
-"o disponibile solo all'interno di un'altra sorgente\n"
+"Il pacchetto %s non ha versioni disponibili, ma è nominato da un altro\n"
+"pacchetto. Questo significa che il pacchetto manca, è diventato obsoleto\n"
+"oppure è disponibile solo all'interno di un'altra sorgente\n"
#: cmdline/apt-get.cc:1133
msgid "However the following packages replace it:"
@@ -979,27 +984,29 @@ msgstr "Il pacchetto %s non ha candidati da installare"
#: cmdline/apt-get.cc:1156
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "La reinstallazione di %s non possibile, non pu essere scaricato.\n"
+msgstr "La reinstallazione di %s non è possibile, non può essere scaricato.\n"
#: cmdline/apt-get.cc:1164
#, c-format
msgid "%s is already the newest version.\n"
-msgstr "%s gi alla versione pi recente.\n"
+msgstr "%s è già alla versione più recente.\n"
+# (ndt) dovrebbe essere inteso il file Release
#: cmdline/apt-get.cc:1193
#, c-format
msgid "Release '%s' for '%s' was not found"
-msgstr "Non stata trovata la release '%s' per '%s'"
+msgstr "Release \"%s\" per \"%s\" non trovato."
+# (ndt) dovrebbe essere inteso il Version
#: cmdline/apt-get.cc:1195
#, c-format
msgid "Version '%s' for '%s' was not found"
-msgstr "Non stata trovata la versione '%s' per '%s'"
+msgstr "Version \"%s\" per \"%s\" non trovato"
#: cmdline/apt-get.cc:1201
#, c-format
msgid "Selected version %s (%s) for %s\n"
-msgstr "Versione selezionata %s (%s) per %s\n"
+msgstr "Versione %s (%s) selezionata per %s\n"
#: cmdline/apt-get.cc:1338
msgid "The update command takes no arguments"
@@ -1007,32 +1014,32 @@ msgstr "Il comando update non accetta argomenti"
#: cmdline/apt-get.cc:1351
msgid "Unable to lock the list directory"
-msgstr "Impossibile creare un lock sulla directory di list"
+msgstr "Impossibile bloccare la directory"
#: cmdline/apt-get.cc:1403
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-"Non siamo autorizzati a rimuovere nulla, impossibile avviare AutoRemover"
+"Non si è autorizzati a rimuovere nulla, impossibile avviare AutoRemover"
#: cmdline/apt-get.cc:1435
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
-"I seguenti pacchetti erano stati automaticamente installati e non sono pi "
+"I seguenti pacchetti sono stati installati automaticamente e non sono più "
"richiesti:"
#: cmdline/apt-get.cc:1437
msgid "Use 'apt-get autoremove' to remove them."
-msgstr "Usare 'apt-get autoremove' per rimuoverli."
+msgstr "Usare \"apt-get autoremove\" per rimuoverli."
#: cmdline/apt-get.cc:1442
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-"Hmm, sembra che AutoRemover abbia distrutto qualcosa e questo\n"
-"non dovrebbe accadere. Si prega di compilare un bug report per apt."
+"Sembra che AutoRemover abbia rovinato qualcosa e questo\n"
+"non doveva accadere. Segnalare un bug riguardo apt."
#.
#. if (Packages == 1)
@@ -1050,11 +1057,11 @@ msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
#: cmdline/apt-get.cc:1449
msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Errore interno, AutoRemover ha dato problemi"
+msgstr "Errore interno, AutoRemover ha rovinato qualche cosa"
#: cmdline/apt-get.cc:1468
msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Errore interno, AllUpgrade ha rotto qualcosa"
+msgstr "Errore interno, AllUpgrade ha rovinato qualche cosa"
#: cmdline/apt-get.cc:1523
#, c-format
@@ -1064,30 +1071,30 @@ msgstr "Impossibile trovare il task %s"
#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
#, c-format
msgid "Couldn't find package %s"
-msgstr "Impossibile trovare %s"
+msgstr "Impossibile trovare il pacchetto %s"
#: cmdline/apt-get.cc:1661
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Nota, si sta selezionando %s per la regex '%s'\n"
+msgstr "Nota, si sta selezionando %s per l'espressione regolare \"%s\"\n"
#: cmdline/apt-get.cc:1692
#, c-format
msgid "%s set to manually installed.\n"
-msgstr "%s impostato per installazione manuale.\n"
+msgstr "È stato impostato %s per l'installazione manuale.\n"
#: cmdline/apt-get.cc:1705
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-" consigliabile eseguire 'apt-get -f install' per correggere questi problemi:"
+"È utile eseguire \"apt-get -f install\" per correggere questi problemi:"
#: cmdline/apt-get.cc:1708
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-"Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o "
-"specificare una soluzione)."
+"Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti "
+"(o specificare una soluzione)."
#: cmdline/apt-get.cc:1720
msgid ""
@@ -1096,18 +1103,18 @@ msgid ""
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
msgstr ""
-"Alcuni pacchetti non possono essere installati. Questo pu voler\n"
-"dire che stata richiesta una situazione impossibile oppure, se\n"
-"si sta usando la distribuzione \"unstable\", che alcuni pacchetti\n"
-"richiesti non sono ancora stati creati o rimossi da incoming."
+"Alcuni pacchetti non possono essere installati. Questo può voler dire\n"
+"che è stata richiesta una situazione impossibile oppure, se si sta\n"
+"usando una distribuzione in sviluppo, che alcuni pacchetti richiesti\n"
+"non sono ancora stati creati o sono stati rimossi da Incoming."
#: cmdline/apt-get.cc:1738
msgid "Broken packages"
-msgstr "Pacchetto non integro"
+msgstr "Pacchetto danneggiato"
#: cmdline/apt-get.cc:1767
msgid "The following extra packages will be installed:"
-msgstr "I seguenti pacchetti verranno inoltre installati:"
+msgstr "I seguenti pacchetti saranno inoltre installati:"
#: cmdline/apt-get.cc:1856
msgid "Suggested packages:"
@@ -1119,23 +1126,24 @@ msgstr "Pacchetti raccomandati:"
#: cmdline/apt-get.cc:1885
msgid "Calculating upgrade... "
-msgstr "Calcolo dell'aggiornamento in corso... "
+msgstr "Calcolo dell'aggiornamento... "
#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
-msgstr "Fallito"
+msgstr "Non riuscito"
#: cmdline/apt-get.cc:1893
msgid "Done"
-msgstr "Fatto"
+msgstr "Eseguito"
#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
msgid "Internal error, problem resolver broke stuff"
-msgstr "Errore interno, problem resolver ha rotto qualcosa"
+msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa"
#: cmdline/apt-get.cc:2068
msgid "Must specify at least one package to fetch source for"
-msgstr "Bisogna specificare almeno un pacchetto di cui scaricare il sorgente"
+msgstr ""
+"È necessario specificare almeno un pacchetto di cui recuperare il sorgente"
#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
#, c-format
@@ -1145,71 +1153,71 @@ msgstr "Impossibile trovare un pacchetto sorgente per %s"
#: cmdline/apt-get.cc:2147
#, c-format
msgid "Skipping already downloaded file '%s'\n"
-msgstr "Si saltato il file gi scaricato '%s'\n"
+msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n"
#: cmdline/apt-get.cc:2175
#, c-format
msgid "You don't have enough free space in %s"
-msgstr "Lo spazio libero in %s non sufficiente"
+msgstr "Lo spazio libero in %s è insufficiente"
#: cmdline/apt-get.cc:2181
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
-msgstr " necessario prendere %sB/%sB di sorgenti.\n"
+msgstr "È necessario recuperare %sB/%sB di sorgenti.\n"
#: cmdline/apt-get.cc:2184
#, c-format
msgid "Need to get %sB of source archives.\n"
-msgstr " necessario prendere %sB di sorgenti\n"
+msgstr "È necessario recuperare %sB di sorgenti\n"
#: cmdline/apt-get.cc:2190
#, c-format
msgid "Fetch source %s\n"
-msgstr "Prelievo del sorgente %s\n"
+msgstr "Recupero sorgente %s\n"
#: cmdline/apt-get.cc:2221
msgid "Failed to fetch some archives."
-msgstr "Non stato possibile scaricare alcuni archivi."
+msgstr "Recupero di alcuni archivi non riuscito."
#: cmdline/apt-get.cc:2249
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Si saltata l'estrazione del sorgente gi estratto in %s\n"
+msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n"
#: cmdline/apt-get.cc:2261
#, c-format
msgid "Unpack command '%s' failed.\n"
-msgstr "Comando di estrazione '%s' fallito.\n"
+msgstr "Comando di estrazione \"%s\" non riuscito.\n"
#: cmdline/apt-get.cc:2262
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Verificare se il pacchetto 'dpkg-dev' installato.\n"
+msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n"
#: cmdline/apt-get.cc:2279
#, c-format
msgid "Build command '%s' failed.\n"
-msgstr "Comando di costruzione '%s' fallito.\n"
+msgstr "Comando \"%s\" di generazione non riuscito.\n"
#: cmdline/apt-get.cc:2298
msgid "Child process failed"
-msgstr "Processo figlio fallito"
+msgstr "Creazione processo figlio non riuscita"
#: cmdline/apt-get.cc:2314
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-"Bisogna specificare almeno un pacchetto di cui controllare la generazione di "
-"dipendenze"
+"È necessario specificare almeno un pacchetto di cui controllare le "
+"dipendenze di generazione"
#: cmdline/apt-get.cc:2342
#, c-format
msgid "Unable to get build-dependency information for %s"
-msgstr "Impossibile ottenere informazioni di dipendenza di costruzione per %s"
+msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s"
#: cmdline/apt-get.cc:2362
#, c-format
msgid "%s has no build depends.\n"
-msgstr "%s non ha dipendenze di costruzione.\n"
+msgstr "%s non ha dipendenze di generazione.\n"
#: cmdline/apt-get.cc:2414
#, c-format
@@ -1217,8 +1225,8 @@ msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-"%s dipendenze per %s non possono essere soddisfatte perch non si trova il "
-"pacchetto %s"
+"%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s "
+"non può essere trovato"
#: cmdline/apt-get.cc:2467
#, c-format
@@ -1226,29 +1234,29 @@ msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-"%s dipendenze per %s non possono essere soddisfatte perch nessuna versione "
-"del pacchetto %s pu soddisfare le richieste di versione"
+"%s dipendenze per %s non possono essere soddisfatte perché nessuna versione "
+"del pacchetto %s può soddisfare le richieste di versione"
#: cmdline/apt-get.cc:2503
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-"La dipendenza %s per %s non stata soddisfatta: il pacchetto installato %s "
-" troppo nuovo"
+"La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s "
+"è troppo nuovo"
#: cmdline/apt-get.cc:2528
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "La dipendenza %s per %s: %s fallita"
+msgstr "La dipendenza %s per %s non è stata soddisfatta: %s"
#: cmdline/apt-get.cc:2542
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Non stato possibile soddisfare le dipendenze di costruzione per %s."
+msgstr "Le dipendenze di generazione per %s non sono state soddisfatte."
#: cmdline/apt-get.cc:2546
msgid "Failed to process build dependencies"
-msgstr "Il calcolo delle dipendenze per la costruzione fallito"
+msgstr "Elaborazione delle dipendenze di generazione non riuscita"
#: cmdline/apt-get.cc:2578
msgid "Supported modules:"
@@ -1297,56 +1305,58 @@ msgid ""
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
msgstr ""
-"Utilizzo: apt-get [opzioni] comando\n"
-" apt-get [opzioni] install|remove pkg1 [pkg2 ...]\n"
-" apt-get [opzioni] source pkg1 [pkg2 ...]\n"
+"Uso: apt-get [OPZIONI] COMANDO\n"
+" apt-get [OPZIONI] install|remove PKG1 [PKG2 ...]\n"
+" apt-get [OPZIONI] source PKG1 [PKG2 ...]\n"
"\n"
-"apt-get una semplice interfaccia a linea di comando per scaricare \n"
-"e installare pacchetti. I comandi pi usati sono update \n"
-"e install.\n"
+"apt-get è una semplice interfaccia a riga di comando per scaricare \n"
+"e installare pacchetti. I comandi più usati sono update e install.\n"
"\n"
"Comandi:\n"
-" update - Scarica la nuova lista di pacchetti\n"
+" update - Scarica l'elenco aggiornato dei pacchetti\n"
" upgrade - Esegue un aggiornamento dei pacchetti installati\n"
-" install - Installa nuovi pacchetti (il pkg libc6 non libc6.deb)\n"
-" remove - Rimuove pacchetti\n"
-" autoremove - Rimuove automaticamente pacchetti inutilizzati\n"
-" purge - Rimuove completamente i pacchetti\n"
+" install - Installa nuovi pacchetti (PKG è libc6 non libc6.deb)\n"
+" remove - Rimuove i pacchetti\n"
+" autoremove - Rimuove automaticamente i pacchetti inutilizzati\n"
+" purge - Rimuove i pacchetti e la loro configurazione\n"
" source - Scarica i pacchetti sorgente\n"
" build-dep - Configura le dipendenze di compilazione per i pacchetti "
"sorgente\n"
-" dist-upgrade - Aggiornamento della distribuzione, vedere apt-get(8)\n"
+" dist-upgrade - Esegue un avanzamento della distribuzione, consultare apt-"
+"get(8)\n"
" dselect-upgrade - Segue le selezioni di dselect\n"
-" clean - Cancella l'archivio temporaneo dei pacchetti scaricati \n"
-" autoclean - Cancella vecchi archivi temporanei di pacchetti scaricati\n"
+" clean - Elimina i file dei pacchetti scaricati\n"
+" autoclean - Elimina i vecchi pacchetti scaricati\n"
" check - Verifica che non ci siano dipendenze insoddisfatte\n"
"\n"
"Opzioni:\n"
-" -h Questo help.\n"
-" -q Output registrabile - nessun indicatore di progresso\n"
-" -qq Nessun output eccetto per gli errori\n"
-" -d Solamente download - NON installa o decomprime gli archivi\n"
-" -s Nessuna azione. Simula i passi in ordine\n"
-" -y Assume s a tutte le domande e non chiede conferma\n"
-" -f Tenta di continuare se il controllo di integrit fallisce\n"
-" -m Tenta di continuare se gli archivi non si trovano\n"
-" -u Mostra una lista dei pacchetti da aggiornare\n"
-" -b Costruisce il pacchetto sorgente dopo averlo scaricato\n"
-" -V Mostra dettagliatamente i numeri di versione\n"
+" -h Mostra questo aiuto\n"
+" -q Output registrabile, nessun indicatore di avanzamento\n"
+" -qq Nessun output eccetto gli errori\n"
+" -d Scarica solamente, NON installa o decomprime gli archivi\n"
+" -s Nessuna azione, simula i passi in ordine\n"
+" -y Assume una risposta affermativa a tutte le domande e non chiede "
+"conferma\n"
+" -f Tenta di continuare se il controllo di integrità non riesce\n"
+" -m Tenta di continuare se gli archivi non sono localizzabili\n"
+" -u Mostra un elenco dei pacchetti aggiornati\n"
+" -b Genera il pacchetto sorgente dopo averlo recuperato\n"
+" -V Mostra prolissamente i numeri di versione\n"
" -c=? Legge come configurazione il file specificato\n"
-" -o=? Imposta un'opzione di configurazione, es -o dir::cache=/tmp\n"
-"Consultare le pagine apt-get(8), sources.list(5) e apt.conf(5) del manuale\n"
-"per maggiori informazioni e opzioni.\n"
-" Questo APT ha i Poteri della Super Mucca.\n"
+" -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n"
+"Per maggiori informazioni e opzioni, consultare le pagine di manuale\n"
+"apt-get(8), sources.list(5) e apt.conf(5).\n"
+" Questo APT ha i poteri della Super Mucca.\n"
#: cmdline/acqprogress.cc:55
msgid "Hit "
-msgstr "Hit "
+msgstr "Trovato "
#: cmdline/acqprogress.cc:79
msgid "Get:"
-msgstr "Get:"
+msgstr "Scaricare:"
+# (ndt) questa non so cosa voglia dire
#: cmdline/acqprogress.cc:110
msgid "Ign "
msgstr "Ign "
@@ -1358,12 +1368,12 @@ msgstr "Err "
#: cmdline/acqprogress.cc:135
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Scaricato %sB in %s (%sB/s)\n"
+msgstr "Recuperati %sB in %s (%sB/s)\n"
#: cmdline/acqprogress.cc:225
#, c-format
msgid " [Working]"
-msgstr " [In corso]"
+msgstr " [In lavorazione]"
#: cmdline/acqprogress.cc:271
#, c-format
@@ -1372,13 +1382,13 @@ msgid ""
" '%s'\n"
"in the drive '%s' and press enter\n"
msgstr ""
-"Cambio disco: Inserire il disco chiamato\n"
-" '%s'\n"
-"nel dispositivo '%s' e premere invio\n"
+"Cambio disco: inserire il disco chiamato\n"
+" \"%s\"\n"
+"nel dispositivo \"%s\" e premere Invio\n"
#: cmdline/apt-sortpkgs.cc:86
msgid "Unknown package record!"
-msgstr "Campo del pacchetto sconosciuto!"
+msgstr "Record del pacchetto sconosciuto."
#: cmdline/apt-sortpkgs.cc:150
msgid ""
@@ -1393,54 +1403,55 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Utilizzo: apt-sortpkgs [opzioni] file1 [file2 ...]\n"
+"Uso: apt-sortpkgs [OPZIONI] FILE1 [FILE2 ...]\n"
"\n"
-"apt-sortpkgs un semplice tool per ordinare il file dei pacchetti. "
-"L'opzione -s\n"
-" usata per indicare che tipo di file .\n"
+"apt-sortpkgs è uno strumento per ordinare i file dei pacchetti.\n"
+"L'opzione -s è usata per indicare il tipo di file.\n"
"\n"
"Opzioni:\n"
-" -h Questo help\n"
+" -h Mostra questo aiuto\n"
" -s Ordina per pacchetto sorgente\n"
" -c=? Legge come configurazione il file specificato\n"
-" -o=? Imposta un'opzione di configurazione, es -o dir::cache=/tmp\n"
+" -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n"
#: dselect/install:32
msgid "Bad default setting!"
-msgstr "Opzione predefinita errata!"
+msgstr "Impostazione predefinita errata."
#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
#: dselect/install:105 dselect/update:45
msgid "Press enter to continue."
-msgstr "Premere invio per continuare."
+msgstr "Premere Invio per continuare."
#: dselect/install:91
msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr "Cancellare tutti i file deb precedentemente scaricati?"
+msgstr "Eliminare tutti i file .deb precedentemente scaricati?"
# Note to translators: The following four messages belong together. It doesn't
# matter where sentences start, but it has to fit in just these four lines, and
# at only 80 characters per line, if possible.
#: dselect/install:101
msgid "Some errors occurred while unpacking. I'm going to configure the"
-msgstr "Si sono verificati alcuni errori nella scompattazione. Si cercher di "
+msgstr ""
+"Si sono verificati alcuni errori nell'estrazione. Verrà tentato di "
+"configurare "
#: dselect/install:102
msgid "packages that were installed. This may result in duplicate errors"
msgstr ""
-"configurare i pacchetti che sono stati installati. Questo potrebbe generare "
+"i pacchetti che sono stati installati. Questo potrebbe generare molteplici "
#: dselect/install:103
msgid "or errors caused by missing dependencies. This is OK, only the errors"
msgstr ""
-"errori duplicati o errori causati da dipendenze non soddisfatte. Questo va "
+"errori o errori causati da dipendenze mancanti. Questo non causa problemi, "
#: dselect/install:104
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
-" bene solo se gli errori sopra questo messaggio sono importanti. Si prega "
-"di correggerli e di eseguire [I]nstall un'altra volta"
+"gli errori precedenti sono importanti. Correggerli e rieseguire "
+"l'installazione"
#: dselect/update:30
msgid "Merging available information"
@@ -1448,24 +1459,24 @@ msgstr "Aggiornamento delle informazioni disponibili"
#: apt-inst/contrib/extracttar.cc:114
msgid "Failed to create pipes"
-msgstr "Impossibile creare delle pipe"
+msgstr "Creazione delle pipe non riuscita"
#: apt-inst/contrib/extracttar.cc:141
msgid "Failed to exec gzip "
-msgstr "Impossibile eseguire gzip "
+msgstr "Esecuzione di gzip non riuscita"
#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
msgid "Corrupted archive"
-msgstr "Archivio corrotto"
+msgstr "Archivio danneggiato"
#: apt-inst/contrib/extracttar.cc:193
msgid "Tar checksum failed, archive corrupted"
-msgstr "Checksum di tar fallito, archivio corrotto"
+msgstr "Checksum di tar non riuscito, archivio danneggiato"
#: apt-inst/contrib/extracttar.cc:296
#, c-format
msgid "Unknown TAR header type %u, member %s"
-msgstr "Tipo %u nell'header del tar sconosciuto, member %s"
+msgstr "Intestazione TAR di tipo %u sconosciuta, member %s"
#: apt-inst/contrib/arfile.cc:70
msgid "Invalid archive signature"
@@ -1473,19 +1484,19 @@ msgstr "Firma dell'archivio non valida"
#: apt-inst/contrib/arfile.cc:78
msgid "Error reading archive member header"
-msgstr "Errore nella lettura del member header dell'archivio"
+msgstr "Errore nel leggere l'intestazione member dell'archivio"
#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
-msgstr "Member header dell'archivio non valido"
+msgstr "Intestazione member dell'archivio non valida"
#: apt-inst/contrib/arfile.cc:128
msgid "Archive is too short"
-msgstr "L'archivio troppo corto"
+msgstr "L'archivio è troppo piccolo"
#: apt-inst/contrib/arfile.cc:132
msgid "Failed to read the archive headers"
-msgstr "Impossibile leggere gli header dell'archivio"
+msgstr "Lettura delle intestazioni dell'archivio non riuscita"
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
@@ -1493,11 +1504,11 @@ msgstr "Dropnode invocata su un nodo ancora collegato"
#: apt-inst/filelist.cc:412
msgid "Failed to locate the hash element!"
-msgstr "Impossibile localizzare l'elemento hash!"
+msgstr "Localizzazione dell'elemento hash non riuscita."
#: apt-inst/filelist.cc:459
msgid "Failed to allocate diversion"
-msgstr "Impossibile allocare la deviazione"
+msgstr "Allocazione della deviazione non riuscita"
#: apt-inst/filelist.cc:464
msgid "Internal error in AddDiversion"
@@ -1506,8 +1517,7 @@ msgstr "Errore interno in AddDiversion"
#: apt-inst/filelist.cc:477
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr ""
-"Tentativo di sovrascrittura di una deviazione in corso, %s -> %s e %s/%s"
+msgstr "Tentativo di sovrascrivere una deviazione, %s -> %s e %s/%s"
#: apt-inst/filelist.cc:506
#, c-format
@@ -1517,42 +1527,42 @@ msgstr "Doppia aggiunta di deviazione %s -> %s"
#: apt-inst/filelist.cc:549
#, c-format
msgid "Duplicate conf file %s/%s"
-msgstr "File di configurazione duplice %s/%s"
+msgstr "File di configurazione duplicato %s/%s"
#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
#, c-format
msgid "Failed to write file %s"
-msgstr "Impossibile scrivere il file %s"
+msgstr "Scrittura del file %s non riuscita"
#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
#, c-format
msgid "Failed to close file %s"
-msgstr "Chiusura del file %s fallita"
+msgstr "Chiusura del file %s non riuscita"
#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
#, c-format
msgid "The path %s is too long"
-msgstr "Il path %s troppo lungo"
+msgstr "Il percorso %s è troppo lungo"
#: apt-inst/extract.cc:124
#, c-format
msgid "Unpacking %s more than once"
-msgstr "Estrazione di %s eseguita pi di una volta"
+msgstr "Estrazione di %s eseguita più di una volta"
#: apt-inst/extract.cc:134
#, c-format
msgid "The directory %s is diverted"
-msgstr "La directory %s deviata"
+msgstr "La directory %s è deviata"
#: apt-inst/extract.cc:144
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr ""
-"Il pacchetto sta cercando di scrivere nella deviazione di destinazione %s/%s"
+"Il pacchetto sta cercando di scrivere nell'obiettivo di deviazione %s/%s"
#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
msgid "The diversion path is too long"
-msgstr "Il path della deviazione troppo lungo"
+msgstr "Il percorso della deviazione è troppo lungo"
#: apt-inst/extract.cc:240
#, c-format
@@ -1561,11 +1571,11 @@ msgstr "La directory %s sta per essere sostituita da una non-directory"
#: apt-inst/extract.cc:280
msgid "Failed to locate node in its hash bucket"
-msgstr "Impossibile localizzare il nodo nel suo hash bucket"
+msgstr "Localizzazione del nodo nel suo hash bucket non riuscita"
#: apt-inst/extract.cc:284
msgid "The path is too long"
-msgstr "Il path troppo lungo"
+msgstr "Il percorso è troppo lungo"
#: apt-inst/extract.cc:414
#, c-format
@@ -1587,12 +1597,12 @@ msgstr "Impossibile leggere %s"
#: apt-inst/extract.cc:491
#, c-format
msgid "Unable to stat %s"
-msgstr "Impossibile analizzare %s"
+msgstr "Impossibile eseguire stat su %s"
#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
#, c-format
msgid "Failed to remove %s"
-msgstr "Impossibile rimuovere %s"
+msgstr "Rimozione di %s non riuscita"
#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
#, c-format
@@ -1602,32 +1612,32 @@ msgstr "Impossibile creare %s"
#: apt-inst/deb/dpkgdb.cc:114
#, c-format
msgid "Failed to stat %sinfo"
-msgstr "Impossibile analizzare %sinfo"
+msgstr "Esecuzione di stat su %sinfo non riuscita"
#: apt-inst/deb/dpkgdb.cc:119
msgid "The info and temp directories need to be on the same filesystem"
-msgstr "Le directory temp e info devono essere sullo stesso filesystem"
+msgstr "Le directory temp e info devono essere sullo stesso file system"
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:760
#: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834
#: apt-pkg/pkgcachegen.cc:957
msgid "Reading package lists"
-msgstr "Lettura della lista dei pacchetti in corso"
+msgstr "Lettura elenco dei pacchetti"
#: apt-inst/deb/dpkgdb.cc:176
#, c-format
msgid "Failed to change to the admin dir %sinfo"
-msgstr "Impossibile raggiungere la directory admin %sinfo"
+msgstr "Cambio della directory admin %sinfo non riuscito"
#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
#: apt-inst/deb/dpkgdb.cc:444
msgid "Internal error getting a package name"
-msgstr "Errore interno nel prendere un nome di un pacchetto"
+msgstr "Errore interno nel recuperare un nome di un pacchetto"
#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
msgid "Reading file listing"
-msgstr "Lettura della lista dei file in corso"
+msgstr "Lettura elenco dei file"
#: apt-inst/deb/dpkgdb.cc:212
#, c-format
@@ -1636,37 +1646,37 @@ msgid ""
"then make it empty and immediately re-install the same version of the "
"package!"
msgstr ""
-"Impossibile aprire file di lista '%sinfo%s'. Se non si pu ripristinare "
-"questo file allora crearne uno vuoto e reinstallare immediatamente la stessa "
-"versione del pacchetto!"
+"Impossibile aprire il file dell'elenco \"%sinfo/%s\". Se non è possibile "
+"ripristinarlo, crearne uno vuoto e reinstallare immediatamente la stessa "
+"versione del pacchetto."
#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
#, c-format
msgid "Failed reading the list file %sinfo/%s"
-msgstr "Errore nella lettura del file di lista %sinfo%s"
+msgstr "Lettura del file dell'elenco %sinfo/%s non riuscita"
#: apt-inst/deb/dpkgdb.cc:262
msgid "Internal error getting a node"
-msgstr "Errore interno nel prendere un nodo"
+msgstr "Errore interno nel recuperare un nodo"
#: apt-inst/deb/dpkgdb.cc:305
#, c-format
msgid "Failed to open the diversions file %sdiversions"
-msgstr "Impossibile aprire il file di diversion %sdiversions"
+msgstr "Apertura del file di deviazione %sdiversions non riuscita"
#: apt-inst/deb/dpkgdb.cc:320
msgid "The diversion file is corrupted"
-msgstr "Il file di diversion corrotto"
+msgstr "Il file di diversion è danneggiato"
#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
#: apt-inst/deb/dpkgdb.cc:337
#, c-format
msgid "Invalid line in the diversion file: %s"
-msgstr "Linea non valida nel file di diversion: %s"
+msgstr "Riga non valida nel file di diversion: %s"
#: apt-inst/deb/dpkgdb.cc:358
msgid "Internal error adding a diversion"
-msgstr "Errore interno nell'aggiunta di una diversion"
+msgstr "Errore interno nell'aggiungere una deviazioni"
#: apt-inst/deb/dpkgdb.cc:379
msgid "The pkg cache must be initialized first"
@@ -1675,57 +1685,58 @@ msgstr "La cache dei pacchetti deve prima essere inizializzata"
#: apt-inst/deb/dpkgdb.cc:439
#, c-format
msgid "Failed to find a Package: header, offset %lu"
-msgstr "Impossibile trovare un Pacchetto: header, offset %lu"
+msgstr "Impossibile trovare un Package: header, offset %lu"
#: apt-inst/deb/dpkgdb.cc:461
#, c-format
msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr "Sezione ConfFile nel file status non corretta. Offset %lu"
+msgstr "Sezione ConfFile nel file di stato non corretta. Offset %lu"
#: apt-inst/deb/dpkgdb.cc:466
#, c-format
msgid "Error parsing MD5. Offset %lu"
-msgstr "Errore nel parsing MD5. Offset %lu"
+msgstr "Errore nell'analisi MD5. Offset %lu"
#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Questo non un archivio DEB valido, member '%s' mancante"
+msgstr "Questo non è un archivio DEB valido: membro \"%s\" mancante"
#: apt-inst/deb/debfile.cc:50
#, c-format
msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr "Questo non un valido file DEB, campi '%s', '%s' o '%s' mancanti"
+msgstr ""
+"Questo non è un archivio DEB valido: membri \"%s\", \"%s\" o \"%s\" mancanti"
#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
-msgstr "Impossibile cambiare su %s"
+msgstr "Impossibile passare a %s"
#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
-msgstr "Errore interno, impossibile localizzare il campo"
+msgstr "Errore interno, impossibile localizzare il membro"
#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
-msgstr "Impossibile localizzare un file control valido"
+msgstr "Impossibile localizzare un file \"control\" valido"
#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
-msgstr "File control non corretto"
+msgstr "File \"control\" non analizzabile"
#: methods/cdrom.cc:114
#, c-format
msgid "Unable to read the cdrom database %s"
-msgstr "Impossibile leggere il database del cdrom %s"
+msgstr "Impossibile leggere il database del CD-ROM %s"
#: methods/cdrom.cc:123
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
msgstr ""
-"Si prega di usare apt-cdrom per far riconoscere questo CD-ROM da APT. apt-"
-"get update non pu essere usato per aggiungere nuovi CD-ROM"
+"Usare apt-cdrom per far riconoscere questo CD-ROM da APT. apt-get update non "
+"può essere usato per aggiungere nuovi CD-ROM"
#: methods/cdrom.cc:131
msgid "Wrong CD-ROM"
@@ -1747,15 +1758,15 @@ msgstr "File non trovato"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
-msgstr "Impossibile analizzare"
+msgstr "Esecuzione di stat non riuscita"
#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
-msgstr "Impossibile impostare la data di modifica (modification time)"
+msgstr "Impostazione della data di modifica non riuscita"
#: methods/file.cc:44
msgid "Invalid URI, local URIS must not start with //"
-msgstr "URI non valide, le URI locali non devono iniziare con //"
+msgstr "URI non valido, gli URI locali non devono iniziare con //"
#. Login must be before getpeername otherwise dante won't work.
#: methods/ftp.cc:162
@@ -1764,7 +1775,7 @@ msgstr "Accesso in corso"
#: methods/ftp.cc:168
msgid "Unable to determine the peer name"
-msgstr "Impossibile determinare il nome del peer"
+msgstr "Impossibile determinare il nome del nodo"
#: methods/ftp.cc:173
msgid "Unable to determine the local name"
@@ -1773,39 +1784,40 @@ msgstr "Impossibile determinare il nome locale"
#: methods/ftp.cc:204 methods/ftp.cc:232
#, c-format
msgid "The server refused the connection and said: %s"
-msgstr "Il server ha rifiutato la connessione e ha detto: %s"
+msgstr "Il server ha rifiutato la connessione e riporta: %s"
#: methods/ftp.cc:210
#, c-format
msgid "USER failed, server said: %s"
-msgstr "USER fallito, il server ha detto: %s"
+msgstr "USER non riuscito, il server riporta: %s"
#: methods/ftp.cc:217
#, c-format
msgid "PASS failed, server said: %s"
-msgstr "PASS fallito, il server ha detto: %s"
+msgstr "PASS non riuscito, il server riporta: %s"
#: methods/ftp.cc:237
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-"Si specificato un proxy server ma senza script di login, Acquire::ftp::"
-"ProxyLogin vuoto."
+"È stato specificato un server proxy, ma nessuno script di accesso: Acquire::"
+"ftp::ProxyLogin è vuoto."
#: methods/ftp.cc:265
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr "Comando dello script di login '%s' fallito, il server ha detto: %s"
+msgstr ""
+"Comando dello script di accesso \"%s\" non riuscito, il server riporta: %s"
#: methods/ftp.cc:291
#, c-format
msgid "TYPE failed, server said: %s"
-msgstr "TYPE fallito, il server ha detto: %s"
+msgstr "TYPE non riuscito, il server riporta: %s"
#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
-msgstr "Timeout della connessione"
+msgstr "Connessione scaduta"
#: methods/ftp.cc:335
msgid "Server closed the connection"
@@ -1821,7 +1833,7 @@ msgstr "Una risposta ha superato le dimensioni del buffer."
#: methods/ftp.cc:362 methods/ftp.cc:374
msgid "Protocol corruption"
-msgstr "Corruzione nel protocollo"
+msgstr "Protocollo danneggiato"
#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
msgid "Write error"
@@ -1833,16 +1845,15 @@ msgstr "Impossibile creare un socket"
#: methods/ftp.cc:698
msgid "Could not connect data socket, connection timed out"
-msgstr ""
-"Impossibile connettersi al socket dati, tempo limite di connessione esaurito"
+msgstr "Impossibile connettersi al socket dati, connessione terminata"
#: methods/ftp.cc:704
msgid "Could not connect passive socket."
-msgstr "Impossibile connettersi in modalit passiva"
+msgstr "Impossibile connettere socket passivo."
#: methods/ftp.cc:722
msgid "getaddrinfo was unable to get a listening socket"
-msgstr " stato impossibile ottenere un socket in ascolto con getaddrinfo()"
+msgstr "Impossibile ottenere un socket in ascolto con getaddrinfo()"
#: methods/ftp.cc:736
msgid "Could not bind a socket"
@@ -1868,11 +1879,11 @@ msgstr "Famiglia di indirizzamento %u (AF_*) sconosciuta"
#: methods/ftp.cc:798
#, c-format
msgid "EPRT failed, server said: %s"
-msgstr "EPRT fallito, il server ha detto: %s"
+msgstr "EPRT non riuscito, il server riporta: %s"
#: methods/ftp.cc:818
msgid "Data socket connect timed out"
-msgstr "Tempo limite di connessione esaurito per il socket dati"
+msgstr "Connessione al socket dati terminata"
#: methods/ftp.cc:825
msgid "Unable to accept connection"
@@ -1880,26 +1891,26 @@ msgstr "Impossibile accettare connessioni"
#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
msgid "Problem hashing file"
-msgstr "Problemi nella creazione dell'hash del file"
+msgstr "Si è verificato un problema nel creare l'hash del file"
#: methods/ftp.cc:877
#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr "Impossibile ottenere un file, il server ha detto '%s'"
+msgstr "Impossibile recuperare il file, il server riporta: \"%s\""
#: methods/ftp.cc:892 methods/rsh.cc:322
msgid "Data socket timed out"
-msgstr "Tempo limite esaurito per il socket dati"
+msgstr "Socket dati terminato"
#: methods/ftp.cc:922
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr "Trasferimento dei dati fallito, il server ha detto '%s'"
+msgstr "Trasferimento dati non riuscito, il server riporta: \"%s\""
#. Get the files information
#: methods/ftp.cc:997
msgid "Query"
-msgstr "Query"
+msgstr "Interrogazione"
#: methods/ftp.cc:1109
msgid "Unable to invoke "
@@ -1908,7 +1919,7 @@ msgstr "Impossibile invocare "
#: methods/connect.cc:70
#, c-format
msgid "Connecting to %s (%s)"
-msgstr "Connessione a %s (%s) in corso"
+msgstr "Connessione a %s (%s)"
#: methods/connect.cc:81
#, c-format
@@ -1928,8 +1939,7 @@ msgstr "Impossibile iniziare la connessione a %s:%s (%s)."
#: methods/connect.cc:104
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr ""
-"Impossibile connettersi a %s:%s (%s), tempo limite di connessione esaurito"
+msgstr "Impossibile connettersi a %s:%s (%s), connessione terminata"
#: methods/connect.cc:119
#, c-format
@@ -1941,22 +1951,23 @@ msgstr "Impossibile connettersi a %s:%s (%s)."
#: methods/connect.cc:147 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
-msgstr "Connessione a %s in corso"
+msgstr "Connessione a %s"
#: methods/connect.cc:165 methods/connect.cc:184
#, c-format
msgid "Could not resolve '%s'"
-msgstr "Impossibile risolvere '%s'"
+msgstr "Impossibile risolvere \"%s\""
#: methods/connect.cc:190
#, c-format
msgid "Temporary failure resolving '%s'"
-msgstr "risoluzione di '%s' temporaneamente fallita"
+msgstr "Risoluzione di \"%s\" temporaneamente non riuscita"
#: methods/connect.cc:193
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
-msgstr " accaduto qualcosa di anormale nella risoluzione di '%s:%s' (%i)"
+msgstr ""
+"Si è verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i)"
#: methods/connect.cc:240
#, c-format
@@ -1966,29 +1977,29 @@ msgstr "Impossibile connettersi a %s %s:"
#: methods/gpgv.cc:65
#, c-format
msgid "Couldn't access keyring: '%s'"
-msgstr "Impossibile accedere al keyring '%s'"
+msgstr "Impossibile accedere al portachiavi: \"%s\""
#: methods/gpgv.cc:101
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-"E: Lista argomento da Acquire::gpgv::Options troppo lunga. Uscita in corso."
+msgstr "E: Elenco argomenti da Acquire::gpgv::Options troppo lungo. Uscita."
#: methods/gpgv.cc:205
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-"Errore interno: Firma corretta, ma non stato possibile determinare il "
-"fingerprint della chiave?!"
+"Errore interno: firma corretta, ma non è possibile determinare l'impronta "
+"della chiave."
#: methods/gpgv.cc:210
msgid "At least one invalid signature was encountered."
-msgstr "Almeno una firma non valida stata trovata."
+msgstr "È stata trovata almeno una firma non valida."
#: methods/gpgv.cc:214
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
-"Impossibile esseguire '%s' per verificare la firma (gpgv installato?)"
+"Impossibile eseguire \"%s\" per verificare la firma (forse gpgv non è "
+"installato)"
#: methods/gpgv.cc:219
msgid "Unknown error executing gpgv"
@@ -2003,7 +2014,7 @@ msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
-"Le seguenti firme non sono state verificate perch la chiave pubblica non "
+"Le seguenti firme non sono state verificate perché la chiave pubblica non è "
"disponibile:\n"
#: methods/gzip.cc:64
@@ -2023,11 +2034,11 @@ msgstr "In attesa degli header"
#: methods/http.cc:523
#, c-format
msgid "Got a single header line over %u chars"
-msgstr "Si ottenuto una singola linea di header su %u caratteri"
+msgstr "Ricevuta una singola riga header su %u caratteri"
#: methods/http.cc:531
msgid "Bad header line"
-msgstr "Linea nell'header non corretta"
+msgstr "Riga header non corretta"
#: methods/http.cc:550 methods/http.cc:557
msgid "The HTTP server sent an invalid reply header"
@@ -2035,15 +2046,15 @@ msgstr "Il server HTTP ha inviato un header di risposta non valido"
#: methods/http.cc:586
msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "Il server HTTP ha inviato un Content-Length non valido"
+msgstr "Il server HTTP ha inviato un header Content-Length non valido"
#: methods/http.cc:601
msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "Il server HTTP ha inviato un Content-Range non valido"
+msgstr "Il server HTTP ha inviato un header Content-Range non valido"
#: methods/http.cc:603
msgid "This HTTP server has broken range support"
-msgstr "Questo server HTTP ha il supporto del range bacato"
+msgstr "Questo server HTTP ha un supporto del range non corretto"
#: methods/http.cc:627
msgid "Unknown date format"
@@ -2051,44 +2062,43 @@ msgstr "Formato della data sconosciuto"
#: methods/http.cc:774
msgid "Select failed"
-msgstr "Select fallito"
+msgstr "Select non riuscita"
#: methods/http.cc:779
msgid "Connection timed out"
-msgstr "Tempo limite per la connessione esaurito"
+msgstr "Connessione terminata"
#: methods/http.cc:802
msgid "Error writing to output file"
-msgstr "Errore nella scrittura del file di output"
+msgstr "Errore nello scrivere sul file di output"
#: methods/http.cc:833
msgid "Error writing to file"
-msgstr "Errore nella scrittura nel file"
+msgstr "Errore nello scrivere su file"
#: methods/http.cc:861
msgid "Error writing to the file"
-msgstr "Errore nella scrittura nel file"
+msgstr "Errore nello scrivere sul file"
#: methods/http.cc:875
msgid "Error reading from server. Remote end closed connection"
-msgstr ""
-"Errore nella lettura dal server. Il lato remoto ha chiuso la connessione"
+msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione"
#: methods/http.cc:877
msgid "Error reading from server"
-msgstr "Errore nella lettura dal server"
+msgstr "Errore nel leggere dal server"
#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
-msgstr "Impossibile troncare il file"
+msgstr "Troncamento del file non riuscito"
#: methods/http.cc:1105
msgid "Bad header data"
-msgstr "Header dei dati malformato"
+msgstr "Header dati non corretto"
#: methods/http.cc:1122 methods/http.cc:1177
msgid "Connection failed"
-msgstr "Connessione fallita"
+msgstr "Connessione non riuscita"
#: methods/http.cc:1229
msgid "Internal error"
@@ -2103,9 +2113,14 @@ msgstr "Impossibile eseguire mmap su un file vuoto"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Impossibile eseguire mmap di %lu byte"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "MMap dinamica ha finito lo spazio"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Mmap dinamica esaurita. Aumentare la dimensione di APT::Cache-Limit. Il "
+"valore attuale è: %lu (man 5 apt.conf)."
#: apt-pkg/contrib/strutl.cc:1014
#, c-format
@@ -2115,49 +2130,49 @@ msgstr "Selezione %s non trovata"
#: apt-pkg/contrib/configuration.cc:439
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Tipo di abbreviazione non riconosciuto: '%c'"
+msgstr "Tipo di abbreviazione non riconosciuto: \"%c\""
#: apt-pkg/contrib/configuration.cc:497
#, c-format
msgid "Opening configuration file %s"
-msgstr "Apertura del file di configurazione %s in corso"
+msgstr "Apertura file di configurazione %s"
#: apt-pkg/contrib/configuration.cc:662
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Errore di sintassi %s:%u: Il blocco inizia senza nome"
+msgstr "Errore di sintassi %s:%u: il blocco inizia senza nome"
#: apt-pkg/contrib/configuration.cc:681
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Errore di sintassi %s:%u: Tag malformato"
+msgstr "Errore di sintassi %s:%u: tag non corretto"
#: apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Errore di sintassi %s:%u: Carattere extra dopo il valore"
+msgstr "Errore di sintassi %s:%u: caratteri extra dopo il valore"
#: apt-pkg/contrib/configuration.cc:738
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-"Errore di sintassi %s:%u: Le direttive possono essere fatte solo al livello "
-"pi alto"
+"Errore di sintassi %s:%u: le direttive possono essere fatte solo al livello "
+"più alto"
#: apt-pkg/contrib/configuration.cc:745
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Errore di sintassi %s:%u: Troppi include annidati"
+msgstr "Errore di sintassi %s:%u: troppe inclusioni annidate"
#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Included from here"
-msgstr "Errore di sintassi %s:%u: Incluso da qui"
+msgstr "Errore di sintassi %s:%u: incluso da qui"
#: apt-pkg/contrib/configuration.cc:758
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Errore di sintassi %s:%u: Direttiva non supportata '%s'"
+msgstr "Errore di sintassi %s:%u: direttiva \"%s\" non supportata"
#: apt-pkg/contrib/configuration.cc:809
#, c-format
@@ -2167,7 +2182,7 @@ msgstr "Errore di sintassi %s:%u: caratteri extra alla fine del file"
#: apt-pkg/contrib/progress.cc:153
#, c-format
msgid "%c%s... Error!"
-msgstr "%c%s... Errore!"
+msgstr "%c%s... Errore."
#: apt-pkg/contrib/progress.cc:155
#, c-format
@@ -2177,18 +2192,18 @@ msgstr "%c%s... Fatto"
#: apt-pkg/contrib/cmndline.cc:77
#, c-format
msgid "Command line option '%c' [from %s] is not known."
-msgstr "L'opzione da linea di comando '%c' [da %s] sconosciuta."
+msgstr "Opzione a riga di comando \"%c\" [da %s] sconosciuta."
#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
#: apt-pkg/contrib/cmndline.cc:119
#, c-format
msgid "Command line option %s is not understood"
-msgstr "L'opzione da linea di comando %s non chiara"
+msgstr "Opzione a riga di comando %s non comprensibile"
#: apt-pkg/contrib/cmndline.cc:124
#, c-format
msgid "Command line option %s is not boolean"
-msgstr "L'opzione da linea di comando %s, non booleana"
+msgstr "Opzione a riga di comando %s non booleana"
#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
#, c-format
@@ -2199,68 +2214,68 @@ msgstr "L'opzione %s richiede un argomento."
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
-"Opzione %s: la specifica di configurazione del parametro deve avere un "
+"Opzione %s: la specifica di configurazione dell'oggetto deve avere un "
"=<valore>."
#: apt-pkg/contrib/cmndline.cc:234
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
-msgstr "L'opzione %s richiede un argomento intero, non '%s'"
+msgstr "L'opzione %s richiede un argomento intero, non \"%s\""
#: apt-pkg/contrib/cmndline.cc:265
#, c-format
msgid "Option '%s' is too long"
-msgstr "L'opzione '%s' troppo lunga"
+msgstr "Opzione \"%s\" troppo lunga"
#: apt-pkg/contrib/cmndline.cc:298
#, c-format
msgid "Sense %s is not understood, try true or false."
-msgstr "Il valore %s non chiaro, provare true o false."
+msgstr "Il valore %s non è comprensibile, provare \"true\" o \"false\"."
#: apt-pkg/contrib/cmndline.cc:348
#, c-format
msgid "Invalid operation %s"
-msgstr "Operazione non valida %s"
+msgstr "Operazione %s non valida"
#: apt-pkg/contrib/cdromutl.cc:52
#, c-format
msgid "Unable to stat the mount point %s"
-msgstr "Impossibile accedere al mount point %s"
+msgstr "Impossibile eseguire stat sul punto di mount %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
#, c-format
msgid "Unable to change to %s"
-msgstr "Impossibile raggiungere %s"
+msgstr "Impossibile passare a %s"
#: apt-pkg/contrib/cdromutl.cc:188
msgid "Failed to stat the cdrom"
-msgstr "Impossibile accedere al cdrom"
+msgstr "Esecuzione di stat sul CD-ROM non riuscita"
#: apt-pkg/contrib/fileutl.cc:149
#, c-format
msgid "Not using locking for read only lock file %s"
-msgstr "Locking disabilitato per il file di lock in sola lettura %s"
+msgstr "Blocco disabilitato per il file di blocco in sola lettura %s"
#: apt-pkg/contrib/fileutl.cc:154
#, c-format
msgid "Could not open lock file %s"
-msgstr "Impossibile aprire il file di lock %s"
+msgstr "Impossibile aprire il file di blocco %s"
#: apt-pkg/contrib/fileutl.cc:172
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Lock disabilitato per il file di lock %s nfs montato"
+msgstr "Blocco disabilitato per il file di blocco %s montato via nfs"
#: apt-pkg/contrib/fileutl.cc:176
#, c-format
msgid "Could not get lock %s"
-msgstr "Impossibile ottenere il lock %s"
+msgstr "Impossibile impostare il blocco %s"
#: apt-pkg/contrib/fileutl.cc:444
#, c-format
msgid "Waited for %s but it wasn't there"
-msgstr "In attesa per %s ma non presente"
+msgstr "In attesa di %s ma non era presente"
#: apt-pkg/contrib/fileutl.cc:454
#, c-format
@@ -2270,12 +2285,12 @@ msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault."
#: apt-pkg/contrib/fileutl.cc:457
#, c-format
msgid "Sub-process %s returned an error code (%u)"
-msgstr "Il sottoprocesso %s ha ritornato un codice d'errore (%u)"
+msgstr "Il sottoprocesso %s ha restituito un codice d'errore (%u)"
#: apt-pkg/contrib/fileutl.cc:459
#, c-format
msgid "Sub-process %s exited unexpectedly"
-msgstr "Il sottoprocesso %s uscito inaspettatamente"
+msgstr "Il sottoprocesso %s è uscito inaspettatamente"
#: apt-pkg/contrib/fileutl.cc:503
#, c-format
@@ -2285,24 +2300,24 @@ msgstr "Impossibile aprire il file %s"
#: apt-pkg/contrib/fileutl.cc:559
#, c-format
msgid "read, still have %lu to read but none left"
-msgstr "letto, c'erano ancora %lu da leggere ma non e' stato lasciato nulla"
+msgstr "lettura, c'erano ancora %lu da leggere ma non ne è rimasto alcuno"
#: apt-pkg/contrib/fileutl.cc:589
#, c-format
msgid "write, still have %lu to write but couldn't"
-msgstr "scrittura, c'erano ancora %lu da scrivere ma non era possibile"
+msgstr "scrittura, c'erano ancora %lu da scrivere ma non è stato possibile"
#: apt-pkg/contrib/fileutl.cc:664
msgid "Problem closing the file"
-msgstr "Si verificato un problema chiudendo il file"
+msgstr "Si è verificato un problema nel chiudere il file"
#: apt-pkg/contrib/fileutl.cc:670
msgid "Problem unlinking the file"
-msgstr "Si verificato un problema rimuovendo il file"
+msgstr "Si è verificato un problema nell'eseguire l'unlink del file"
#: apt-pkg/contrib/fileutl.cc:681
msgid "Problem syncing the file"
-msgstr "Si verificato un problema sincronizzando il file"
+msgstr "Si è verificato un problema nel sincronizzare il file"
#: apt-pkg/pkgcache.cc:132
msgid "Empty package cache"
@@ -2310,21 +2325,21 @@ msgstr "Cache dei pacchetti vuota"
#: apt-pkg/pkgcache.cc:138
msgid "The package cache file is corrupted"
-msgstr "Il file cache dei pacchetti corrotto"
+msgstr "Il file della cache dei pacchetti è danneggiato"
#: apt-pkg/pkgcache.cc:143
msgid "The package cache file is an incompatible version"
-msgstr "Il file cache dei pacchetti in una versione incompatibile"
+msgstr "La versione del file della cache dei pacchetti è incompatibile"
#: apt-pkg/pkgcache.cc:148
#, c-format
msgid "This APT does not support the versioning system '%s'"
-msgstr "Questo APT non supporta il sistema di versioning '%s'"
+msgstr "Questo APT non supporta il sistema di versione \"%s\""
#: apt-pkg/pkgcache.cc:153
msgid "The package cache was built for a different architecture"
msgstr ""
-"Il file cache dei pacchetti stato generato per un'architettura differente"
+"Il file della cache dei pacchetti è stato generato per un'altra architettura"
#: apt-pkg/pkgcache.cc:224
msgid "Depends"
@@ -2332,7 +2347,7 @@ msgstr "Dipende"
#: apt-pkg/pkgcache.cc:224
msgid "PreDepends"
-msgstr "Predipende"
+msgstr "Pre-dipende"
#: apt-pkg/pkgcache.cc:224
msgid "Suggests"
@@ -2380,7 +2395,7 @@ msgstr "extra"
#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
msgid "Building dependency tree"
-msgstr "Generazione dell'albero delle dipendenze in corso"
+msgstr "Generazione albero delle dipendenze"
#: apt-pkg/depcache.cc:122
msgid "Candidate versions"
@@ -2397,72 +2412,72 @@ msgstr "Lettura informazioni sullo stato"
#: apt-pkg/depcache.cc:219
#, c-format
msgid "Failed to open StateFile %s"
-msgstr "Impossibile aprire il file di stato (StateFile) %s"
+msgstr "Apertura del file di stato %s non riuscita"
#: apt-pkg/depcache.cc:225
#, c-format
msgid "Failed to write temporary StateFile %s"
-msgstr "Impossibile scrivere il file temporaneo di stato (StateFile) %s"
+msgstr "Scrittura del file temporaneo di stato %s non riuscita"
#: apt-pkg/tagfile.cc:102
#, c-format
msgid "Unable to parse package file %s (1)"
-msgstr "Impossibile analizzare il file dei pacchetti %s (1)"
+msgstr "Impossibile analizzare il file di pacchetto %s (1)"
#: apt-pkg/tagfile.cc:189
#, c-format
msgid "Unable to parse package file %s (2)"
-msgstr "Impossibile analizzare il file dei pacchetti %s (2)"
+msgstr "Impossibile analizzare il file di pacchetto %s (2)"
#: apt-pkg/sourcelist.cc:90
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
-msgstr "La linea %lu in %s (URI) non corretta"
+msgstr "La riga %lu nel file %s non è corretta (URI)"
#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
-msgstr "La linea %lu in %s (dist) non corretta"
+msgstr "La riga %lu nel file %s non è corretta (dist)"
#: apt-pkg/sourcelist.cc:95
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "La linea %lu in %s (URI parse) non corretta"
+msgstr "La riga %lu nel file %s non è corretta (URI parse)"
#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "La linea %lu nella lista delle fonti %s (Absolute dist) non corretta"
+msgstr "La riga %lu nel file %s non è corretta (absolute dist)"
#: apt-pkg/sourcelist.cc:108
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "La linea %lu in %s (dist parse) non corretta"
+msgstr "La riga %lu nel file %s non è corretta (dist parse)"
#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Opening %s"
-msgstr "Apertura di %s in corso"
+msgstr "Apertura di %s"
#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448
#, c-format
msgid "Line %u too long in source list %s."
-msgstr "Linea %u troppo lunga nel source list %s."
+msgstr "Riga %u troppo lunga nel file %s."
#: apt-pkg/sourcelist.cc:236
#, c-format
msgid "Malformed line %u in source list %s (type)"
-msgstr "La linea %u in %s (type) non corretta"
+msgstr "La riga %u nel file %s non è corretta (type)"
#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Il tipo '%s' non riconosciuto alla linea %u nella lista sorgenti %s"
+msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s"
#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "La linea %u in %s (vendor id) non corretta"
+msgstr "La riga %u nel file %s non è corretta (vendor id)"
#: apt-pkg/packagemanager.cc:428
#, c-format
@@ -2471,42 +2486,44 @@ msgid ""
"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-"Quest'installazione necessita della rimozione temporanea del pacchetto "
-"essenziale %s a causa di un loop Conflitto/Pre-Dipendenza. Questo non "
-"bene, ma se si vuole farlo, si attivi l'opzione APT::Force-LoopBreak "
+"L'installazione necessita della rimozione temporanea del pacchetto "
+"essenziale %s a causa di un ciclo conflitto/pre-dipendenza. Questa è una "
+"situazione critica, ma se si vuole realmente procedere, attivare l'opzione "
+"APT::Force-LoopBreak."
#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
-msgstr "Il file indice di tipo '%s' non supportato"
+msgstr "Il file indice di tipo \"%s\" non è supportato"
#: apt-pkg/algorithms.cc:248
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-"Il pacchetto %s deve essere reinstallato, ma non si riesce a trovare un "
-"archivio per esso."
+"Il pacchetto %s deve essere reinstallato, ma non è possibile trovarne un "
+"archivio."
#: apt-pkg/algorithms.cc:1107
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-"Errore, pkgProblemResolver::Resolve ha generato uno stop, questo pu essere "
-"causato da pacchetti bloccati "
+"Errore, pkgProblemResolver::Resolve ha generato delle interruzioni. Questo "
+"potrebbe essere causato da pacchetti bloccati."
#: apt-pkg/algorithms.cc:1109
msgid "Unable to correct problems, you have held broken packages."
-msgstr "Impossibile correggere i problemi, ci sono pacchetti rotti bloccati"
+msgstr ""
+"Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati."
#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-"Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure "
-"si useranno quelli precedenti."
+"Impossibile scaricare alcuni file di indice: saranno ignorati o verranno "
+"usati quelli vecchi."
#: apt-pkg/acquire.cc:59
#, c-format
@@ -2533,24 +2550,22 @@ msgstr "Scaricamento file %li di %li"
#: apt-pkg/acquire-worker.cc:110
#, c-format
msgid "The method driver %s could not be found."
-msgstr "Non stato possibile trovare un driver per il metodo %s."
+msgstr "Impossibile trovare un driver per il metodo %s."
#: apt-pkg/acquire-worker.cc:159
#, c-format
msgid "Method %s did not start correctly"
-msgstr "Il metodo %s non partito correttamente"
+msgstr "Il metodo %s non si è avviato correttamente"
#: apt-pkg/acquire-worker.cc:399
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Per favore inserire il disco chiamato '%s' nel dispositivo '%s' e premere "
-"invio."
+msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio."
#: apt-pkg/init.cc:124
#, c-format
msgid "Packaging system '%s' is not supported"
-msgstr "Il sistema di archiviazione (packaging) '%s' non supportato"
+msgstr "Il sistema di pacchetti \"%s\" non è supportato"
#: apt-pkg/init.cc:140
msgid "Unable to determine a suitable packaging system type"
@@ -2559,153 +2574,151 @@ msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti"
#: apt-pkg/clean.cc:57
#, c-format
msgid "Unable to stat %s."
-msgstr "Impossibile analizzare %s."
+msgstr "Impossibile eseguire stat su %s."
#: apt-pkg/srcrecords.cc:44
msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Bisogna inserire alcuni URI di tipo 'source' in sources.list"
+msgstr ""
+"È necessario inserire alcuni URI di tipo \"source\" nel file sources.list"
#: apt-pkg/cachefile.cc:71
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
-"La lista dei pacchetti o il file di status non possono essere letti o aperti."
+"L'elenco dei pacchetti o il file di stato non può essere letto o aperto."
#: apt-pkg/cachefile.cc:75
msgid "You may want to run apt-get update to correct these problems"
-msgstr " consigliabile eseguire apt-get update per correggere questi problemi"
+msgstr ""
+"È consigliato eseguire \"apt-get update\" per correggere questi problemi"
#: apt-pkg/policy.cc:267
msgid "Invalid record in the preferences file, no Package header"
-msgstr "Campo non valido nel file delle preferenze, Manca \"Package header\""
+msgstr "Campo non valido nel file delle preferenze: manca l'header \"Package\""
#: apt-pkg/policy.cc:289
#, c-format
msgid "Did not understand pin type %s"
-msgstr "Impossibile capire il tipo di pin %s"
+msgstr "Impossibile capire il tipo di gancio %s"
#: apt-pkg/policy.cc:297
msgid "No priority (or zero) specified for pin"
-msgstr "Nessuna (o zero) priorit specificata per il pin"
+msgstr "Priorità per il gancio non specificata (o zero)"
#: apt-pkg/pkgcachegen.cc:72
msgid "Cache has an incompatible versioning system"
-msgstr "La cache ha un sistema incompatibile di gestione delle versioni"
+msgstr "La cache ha un sistema di gestione delle versioni incompatibile"
#: apt-pkg/pkgcachegen.cc:115
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Errore nell'analisi di %s (NewPackage)"
+msgstr "Si è verificato un errore nell'elaborare %s (NewPackage)"
#: apt-pkg/pkgcachegen.cc:130
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Errore nell'analisi di %s (UsePackage1)"
+msgstr "Si è verificato un errore nell'elaborare %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:164
#, c-format
msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Errore nell'analisi di %s (NewFileDesc1)"
+msgstr "Si è verificato un errore nell'elaborare %s (NewFileDesc1)"
#: apt-pkg/pkgcachegen.cc:189
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Errore nell'analisi di %s (UsePackage2)"
+msgstr "Si è verificato un errore nell'elaborare %s (UsePackage2)"
#: apt-pkg/pkgcachegen.cc:193
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Errore nell'analisi di %s (NewFileVer1)"
+msgstr "Si è verificato un errore nell'elaborare %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:224
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "Errore nell'analisi di %s (NewVersion1)"
+msgstr "Si è verificato un errore nell'elaborare %s (NewVersion1)"
#: apt-pkg/pkgcachegen.cc:228
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Errore nell'analisi di %s (UsePackage3)"
+msgstr "Si è verificato un errore nell'elaborare %s (UsePackage3)"
#: apt-pkg/pkgcachegen.cc:232
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Errore nell'analisi di %s (NewVersion2)"
+msgstr "Si è verificato un errore nell'elaborare %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:256
#, c-format
msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Errore nell'analisi di %s (NewFileDesc2)"
+msgstr "Si è verificato un errore nell'elaborare %s (NewFileDesc2)"
#: apt-pkg/pkgcachegen.cc:262
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-"WOW, si ecceduto il numero massimo di nomi di pacchetti che questo APT "
-"capace di gestire"
+"È stato superato il numero di nomi di pacchetti che questo APT può gestire."
#: apt-pkg/pkgcachegen.cc:265
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"WOW, si ecceduto il numero massimo di versioni che questo APT capace di "
-"gestire"
+msgstr "È stato superato il numero di versioni che questo APT può gestire."
#: apt-pkg/pkgcachegen.cc:268
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"WOW, si superato il numero massimo di descrizioni che questo APT capace "
-"di gestire"
+msgstr "È stato superato il numero di descrizioni che questo APT può gestire."
#: apt-pkg/pkgcachegen.cc:271
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"WOW, si ecceduto il numero massimo di dipendenze che questo APT capace "
-"di gestire"
+msgstr "È stato superato il numero di dipendenze che questo APT può gestire."
#: apt-pkg/pkgcachegen.cc:299
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Errore nell'analisi di %s (FindPkg)"
+msgstr "Si è verificato un errore nell'elaborare %s (FindPkg)"
#: apt-pkg/pkgcachegen.cc:312
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Errore nell'analisi di %s (CollectFileProvides)"
+msgstr "Si è verificato un errore nell'elaborare %s (CollectFileProvides)"
+# (ndt) il primo è il nome del pacchetto, il secondo la versione
#: apt-pkg/pkgcachegen.cc:318
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-" stato impossibile trovare %s %s mentre si processava le dipendenze dei file"
+"Il pacchetto %s v.%s non è stato trovato durante l'elaborazione delle "
+"dipendenze"
#: apt-pkg/pkgcachegen.cc:690
#, c-format
msgid "Couldn't stat source package list %s"
-msgstr "Impossibile controllare la lista dei pacchetti sorgente %s"
+msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s"
+# (ndt) non mi convince per niente, ma vediamo cosa salta fuori
#: apt-pkg/pkgcachegen.cc:775
msgid "Collecting File Provides"
-msgstr "Il File Collezionato Fornisce"
+msgstr "Il file fornisce"
#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909
msgid "IO Error saving source cache"
-msgstr "Errore di I/O nel salvataggio del cache sorgente"
+msgstr "Errore di I/O nel salvare la cache sorgente"
#: apt-pkg/acquire-item.cc:127
#, c-format
msgid "rename failed, %s (%s -> %s)."
-msgstr "rename() fallita: %s (%s -> %s)."
+msgstr "rename() non riuscita: %s (%s -> %s)."
#: apt-pkg/acquire-item.cc:401
msgid "MD5Sum mismatch"
-msgstr "Somma MD5 non corrispondente"
+msgstr "MD5sum non corrispondente"
#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426
msgid "Hash Sum mismatch"
-msgstr "Somma Hash non corrispondente"
+msgstr "Somma hash non corrispondente"
#: apt-pkg/acquire-item.cc:1118
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-"Non esiste una chiave pubblica disponibile per i seguenti ID di chiave:\n"
+"Non è disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n"
#: apt-pkg/acquire-item.cc:1231
#, c-format
@@ -2713,9 +2726,8 @@ 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 ""
-"Non stato possibile trovare un file per il pacchetto %s. Questo significa "
-"che bisogna correggere manualmente l'errore. (a causa di un'architettura "
-"mancante)"
+"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:1290
#, c-format
@@ -2723,25 +2735,25 @@ msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-"Non stato possibile trovare file per il pacchetto %s. Questo significa che "
-"bisogna correggere manualmente l'errore."
+"Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario "
+"sistemare manualmente questo pacchetto."
#: apt-pkg/acquire-item.cc:1331
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-"I file indice dei pacchetti sono corrotti. Non c' un campo Filename: per il "
+"L'indice dei file è danneggiato. Manca il campo \"Filename:\" per il "
"pacchetto %s."
#: apt-pkg/acquire-item.cc:1418
msgid "Size mismatch"
-msgstr "Le Dimensioni non corrispondono"
+msgstr "Le dimensioni non corrispondono"
#: apt-pkg/vendorlist.cc:66
#, c-format
msgid "Vendor block %s contains no fingerprint"
-msgstr "Il blocco vendor %s non contiene dati"
+msgstr "Il blocco vendor %s non contiene impronte"
#: apt-pkg/cdrom.cc:529
#, c-format
@@ -2749,30 +2761,30 @@ msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
-"Si user il punto di montaggio del CD-ROM %s\n"
+"Viene usato il punto di mount del CD-ROM %s\n"
"Montaggio CD-ROM\n"
#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627
msgid "Identifying.. "
-msgstr "Identificazione in corso.. "
+msgstr "Identificazione... "
#: apt-pkg/cdrom.cc:563
#, c-format
msgid "Stored label: %s\n"
-msgstr "Etichette salvate: %s \n"
+msgstr "Etichette archiviate: %s \n"
#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841
msgid "Unmounting CD-ROM...\n"
-msgstr "Smontaggio CD-ROM in corso...\n"
+msgstr "Smontaggio CD-ROM...\n"
#: apt-pkg/cdrom.cc:590
#, c-format
msgid "Using CD-ROM mount point %s\n"
-msgstr "Si user il mount point del CD-ROM %s\n"
+msgstr "Viene usato il punto di mount del CD-ROM %s\n"
#: apt-pkg/cdrom.cc:608
msgid "Unmounting CD-ROM\n"
-msgstr "Smontaggio CD-ROM in corso\n"
+msgstr "Smontaggio CD-ROM\n"
#: apt-pkg/cdrom.cc:612
msgid "Waiting for disc...\n"
@@ -2781,11 +2793,11 @@ msgstr "In attesa del disco...\n"
#. Mount the new CDROM
#: apt-pkg/cdrom.cc:620
msgid "Mounting CD-ROM...\n"
-msgstr "Montaggio CD-ROM in corso \n"
+msgstr "Montaggio CD-ROM...\n"
#: apt-pkg/cdrom.cc:638
msgid "Scanning disc for index files..\n"
-msgstr "Scansione del disco alla ricerca di file indice, in corso..\n"
+msgstr "Analisi del disco per file indice...\n"
#: apt-pkg/cdrom.cc:678
#, c-format
@@ -2799,11 +2811,11 @@ msgstr ""
#: apt-pkg/cdrom.cc:715
#, c-format
msgid "Found label '%s'\n"
-msgstr "Etichetta trovata \"%s\"\n"
+msgstr "Trovata l'etichetta \"%s\"\n"
#: apt-pkg/cdrom.cc:744
msgid "That is not a valid name, try again.\n"
-msgstr "Questo non un nome valido, riprovare.\n"
+msgstr "Questo non è un nome valido, riprovare.\n"
#: apt-pkg/cdrom.cc:760
#, c-format
@@ -2811,20 +2823,20 @@ msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-"Questo disco chiamato: \n"
-"'%s'\n"
+"Questo disco è chiamato: \n"
+"\"%s\"\n"
#: apt-pkg/cdrom.cc:764
msgid "Copying package lists..."
-msgstr "Copia della lista dei pacchetti in corso..."
+msgstr "Copia elenco pacchetti..."
#: apt-pkg/cdrom.cc:790
msgid "Writing new source list\n"
-msgstr "Scrittura di una nuova lista sorgenti in corso\n"
+msgstr "Scrittura nuovo elenco sorgenti\n"
#: apt-pkg/cdrom.cc:799
msgid "Source list entries for this disc are:\n"
-msgstr "Le voci lista sorgenti per questo Disco sono:\n"
+msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n"
#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
#, c-format
@@ -2839,52 +2851,53 @@ msgstr "Scritti %i record con %i file mancanti.\n"
#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Scritti %i record con %i file senza match\n"
+msgstr "Scritti %i record con %i file senza corrispondenze\n"
#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "Scritti %i record con %i file mancanti e %i file senza match\n"
+msgstr ""
+"Scritti %i record con %i file mancanti e %i file senza corrispondenze\n"
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
-msgstr "Installazione di %s in corso"
+msgstr "Installazione di %s"
#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612
#, c-format
msgid "Configuring %s"
-msgstr "Configurazione di %s in corso"
+msgstr "Configurazione di %s"
#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627
#, c-format
msgid "Removing %s"
-msgstr "Rimozione di %s in corso"
+msgstr "Rimozione di %s"
#: apt-pkg/deb/dpkgpm.cc:52
#, c-format
msgid "Running post-installation trigger %s"
-msgstr "Esecuzione del comando post installazione %s"
+msgstr "Esecuzione comando di post installazione %s"
#: apt-pkg/deb/dpkgpm.cc:521
#, c-format
msgid "Directory '%s' missing"
-msgstr "Manca la directory '%s'"
+msgstr "Directory \"%s\" mancante"
#: apt-pkg/deb/dpkgpm.cc:605
#, c-format
msgid "Preparing %s"
-msgstr "Preparazione di %s in corso"
+msgstr "Preparazione di %s"
#: apt-pkg/deb/dpkgpm.cc:606
#, c-format
msgid "Unpacking %s"
-msgstr "Scompattamento di %s in corso"
+msgstr "Estrazione di %s"
#: apt-pkg/deb/dpkgpm.cc:611
#, c-format
msgid "Preparing to configure %s"
-msgstr "Preparazione alla configurazione di %s in corso"
+msgstr "Preparazione alla configurazione di %s"
#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
#, c-format
@@ -2894,92 +2907,57 @@ msgstr "Elaborazione opzioni addizionali per %s"
#: apt-pkg/deb/dpkgpm.cc:617
#, c-format
msgid "Installed %s"
-msgstr "%s Installato"
+msgstr "Pacchetto %s installato"
#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624
#: apt-pkg/deb/dpkgpm.cc:625
#, c-format
msgid "Preparing for removal of %s"
-msgstr "Preparazione per la rimozione di %s in corso"
+msgstr "Preparazione alla rimozione di %s"
#: apt-pkg/deb/dpkgpm.cc:628
#, c-format
msgid "Removed %s"
-msgstr "%s rimosso"
+msgstr "Pacchetto %s rimosso"
#: apt-pkg/deb/dpkgpm.cc:633
#, c-format
msgid "Preparing to completely remove %s"
-msgstr "Preparazione alla rimozione totale di %s in corso"
+msgstr "Preparazione alla rimozione completa di %s"
#: apt-pkg/deb/dpkgpm.cc:634
#, c-format
msgid "Completely removed %s"
-msgstr "Rimozione totale completata %s"
+msgstr "Pacchetto %s rimosso completamente"
#: apt-pkg/deb/dpkgpm.cc:791
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr "Impossibile scrivere un log, openpty() fallito (/dev/pts montato?)\n"
+msgstr ""
+"Impossibile scrivere il registro, openpty() non riuscita (forse /dev/pts non "
+"è montato)\n"
#: methods/rred.cc:219
msgid "Could not patch file"
-msgstr "Impossibile aprire il file %s"
+msgstr "Impossibile applicare la patch al file"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Connessione chiusa prematuramente"
-#~ msgid ""
-#~ "Since you only requested a single operation it is extremely likely that\n"
-#~ "the package is simply not installable and a bug report against\n"
-#~ "that package should be filed."
-#~ msgstr ""
-#~ "Poiché Ú stata richiesta solo una singola operazione Ú molto facile "
-#~ "che\n"
-#~ "il pacchetto semplicemente non sia installabile, si consiglia\n"
-#~ "di inviare un \"bug report\" per tale pacchetto."
-
-#, fuzzy
-#~ msgid "Line %d too long (max %lu)"
-#~ msgstr "Linea %d troppo lunga (max %d)"
-
-#, fuzzy
-#~ msgid "Line %d too long (max %d)"
-#~ msgstr "Linea %d troppo lunga (max %d)"
-
-#, fuzzy
-#~ msgid "Error occured while processing %s (NewFileDesc1)"
-#~ msgstr "Errore nell'analisi di %s (NewFileVer1)"
-
-#, fuzzy
-#~ msgid "Error occured while processing %s (NewFileDesc2)"
-#~ msgstr "Errore nell'analisi di %s (NewFileVer1)"
-
-#, fuzzy
-#~ msgid "Stored label: %s \n"
-#~ msgstr "Etichette salvate: %s \n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
-#~ "i signatures\n"
-#~ msgstr "Trovati %i indici di pacchetto, %i indici di sorgenti e %i firme\n"
-
-#, fuzzy
-#~ msgid "openpty failed\n"
-#~ msgstr "Select fallito"
+#~ msgid "No source package '%s' picking '%s' instead\n"
+#~ msgstr "Nessun pacchetto sorgente \"%s\", selezionato \"%s\" al suo posto\n"
-#~ msgid "File date has changed %s"
-#~ msgstr "La data del file Ú cambiata %s"
+#~ msgid "%lid %lih %limin %lis"
+#~ msgstr "%lig %lih %limin %lis"
-#~ msgid "Reading file list"
-#~ msgstr "Lettura della lista dei file in corso"
+#~ msgid "%lih %limin %lis"
+#~ msgstr "%lih %limin %lis"
-#~ msgid "Could not execute "
-#~ msgstr "Impossibile eseguire "
+#~ msgid "%limin %lis"
+#~ msgstr "%limin %lis"
-#~ msgid "Preparing for remove with config %s"
-#~ msgstr "Preparazione per la rimozione con la configurazione %s in corso"
+#~ msgid "%lis"
+#~ msgstr "%lis"
-#~ msgid "Removed with config %s"
-#~ msgstr "Rimosso con la configurazione %s"
+#~ msgid "Not locked"
+#~ msgstr "Non bloccato"
diff --git a/po/ja.po b/po/ja.po
index c4ac2dd0e..c101e7cdc 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2008-11-13 09:26+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -157,7 +157,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s コンパイル日時: %s %s\n"
@@ -655,7 +655,7 @@ msgstr "%s を %s に名前変更できませんでした"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "正規表現の展開エラー - %s"
@@ -818,11 +818,11 @@ msgstr "パッケージを削除しなければなりませんが、削除が無
msgid "Internal error, Ordering didn't finish"
msgstr "内部エラー、調整が終わっていません"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "ダウンロードディレクトリをロックできません"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "ソースのリストを読むことができません。"
@@ -852,7 +852,7 @@ msgstr "この操作後に追加で %sB のディスク容量が消費されま
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "この操作後に %sB のディスク容量が解放されます。\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s の空き領域を測定できません"
@@ -889,7 +889,7 @@ msgstr "中断しました。"
msgid "Do you want to continue [Y/n]? "
msgstr "続行しますか [Y/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s の取得に失敗しました %s\n"
@@ -898,7 +898,7 @@ msgstr "%s の取得に失敗しました %s\n"
msgid "Some files failed to download"
msgstr "いくつかのファイルの取得に失敗しました"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
@@ -997,31 +997,36 @@ msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした"
msgid "Selected version %s (%s) for %s\n"
msgstr "%3$s にはバージョン %1$s (%2$s) を選択しました\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "update コマンドは引数をとりません"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "list ディレクトリをロックできません"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"一連のものを削除するようになっていないので、AutoRemover を開始できません"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"以下のパッケージが自動でインストールされましたが、もう必要とされていません:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "これらを削除するには 'apt-get autoremove' を利用してください。"
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1039,45 +1044,45 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "内部エラー、AutoRemover が何かを破壊しました"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "内部エラー、AllUpgrade が何かを破壊しました"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "タスク %s が見つかりません"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "パッケージ %s が見つかりません"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s は手動でインストールしたと設定されました。\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ"
"ません:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1085,7 +1090,7 @@ msgstr ""
"未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法"
"を明示してください)。"
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1097,118 +1102,118 @@ msgstr ""
"であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n"
"動されていないことが考えられます。"
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "壊れたパッケージ"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "以下の特別パッケージがインストールされます:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "提案パッケージ:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "推奨パッケージ:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "アップグレードパッケージを検出しています ... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "失敗"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "完了"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "内部エラー、問題リゾルバが何かを破壊しました"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr ""
"ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s のソースパッケージが見つかりません"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s に充分な空きスペースがありません"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB のソースアーカイブを取得する必要があります。\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "ソース %s を取得\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "いくつかのアーカイブの取得に失敗しました。"
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "展開コマンド '%s' が失敗しました。\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
"'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "ビルドコマンド '%s' が失敗しました。\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "子プロセスが失敗しました"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s のビルド依存情報を取得できません"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s にはビルド依存情報が指定されていません。\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1217,7 +1222,7 @@ msgstr ""
"パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
"ができません"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1226,32 +1231,33 @@ msgstr ""
"入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対"
"する %1$s の依存関係を満たすことができません"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ"
"ケージは新しすぎます"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s のビルド依存関係を満たすことができませんでした。"
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "ビルド依存関係の処理に失敗しました"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "サポートされているモジュール:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1267,7 +1273,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1870,7 +1876,7 @@ msgstr "データソケット接続タイムアウト"
msgid "Unable to accept connection"
msgstr "接続を accept できません"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "ファイルのハッシュでの問題"
@@ -1954,41 +1960,41 @@ msgstr "'%s:%s' (%i) の解決中に問題が起こりました"
msgid "Unable to connect to %s %s:"
msgstr "%s %s へ接続できません:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "キーリングにアクセスできませんでした: '%s'"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"エラー: Acquire::gpgv::Options の引数リストが長すぎます。終了しています。"
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "少なくとも 1 つの不正な署名が発見されました。"
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"署名を検証するための '%s' の実行ができませんでした (gpgv はインストールされて"
"いますか?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "gpgv の実行中に未知のエラーが発生"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "以下の署名が無効です:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2004,80 +2010,80 @@ msgstr "%s に対してパイプを開けませんでした"
msgid "Read error from %s process"
msgstr "%s プロセスからの読み込みエラー"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "ヘッダの待機中です"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "%u 文字を超える 1 行のヘッダを取得しました"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "不正なヘッダ行です"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "http サーバが不正なリプライヘッダを送信してきました"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http サーバが不正な Content-Length ヘッダを送信してきました"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http サーバが不正な Content-Range ヘッダを送信してきました"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "http サーバのレンジサポートが壊れています"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "不明な日付フォーマットです"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "select に失敗しました"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "接続タイムアウト"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "出力ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "サーバからの読み込みに失敗しました"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "ファイルの切り詰めに失敗しました"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "不正なヘッダです"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "接続失敗"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "内部エラー"
@@ -2090,11 +2096,38 @@ msgstr "空のファイルを mmap できません"
msgid "Couldn't make mmap of %lu bytes"
msgstr "%lu バイトの mmap ができませんでした"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "動的 MMap が制限を越えました"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "選択された %s が見つかりません"
@@ -2522,7 +2555,7 @@ msgstr "メソッドドライバ %s が見つかりません。"
msgid "Method %s did not start correctly"
msgstr "メソッド %s が正常に開始しませんでした"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2895,12 +2928,16 @@ msgstr "%s を完全に削除する準備をしています"
msgid "Completely removed %s"
msgstr "%s を完全に削除しました"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"ログに書き込めません。openpty() に失敗しました (/dev/pts がマウントされていな"
"い?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "ファイルにパッチできませんでした"
@@ -2908,3 +2945,6 @@ msgstr "ファイルにパッチできませんでした"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "途中で接続がクローズされました"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "動的 MMap が制限を越えました"
diff --git a/po/km.po b/po/km.po
index 0712d2bfe..3d3e2dfbe 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: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2006-10-10 09:48+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
"Language-Team: Khmer <support@khmeros.info>\n"
@@ -162,49 +162,13 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s សម្រាប់ %s %s បាន​ចងក្រងនៅលើ​%s %s\n"
#: cmdline/apt-cache.cc:1721
#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| " apt-cache [options] add file1 [file2 ...]\n"
-#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| " add - Add a package file to the source cache\n"
-#| " gencaches - Build both the package and source cache\n"
-#| " showpkg - Show some general information for a single package\n"
-#| " showsrc - Show source records\n"
-#| " stats - Show some basic statistics\n"
-#| " dump - Show the entire file in a terse form\n"
-#| " dumpavail - Print an available file to stdout\n"
-#| " unmet - Show unmet dependencies\n"
-#| " search - Search the package list for a regex pattern\n"
-#| " show - Show a readable record for the package\n"
-#| " depends - Show raw dependency information for a package\n"
-#| " rdepends - Show reverse dependency information for a package\n"
-#| " pkgnames - List the names of all packages\n"
-#| " dotty - Generate package graphs for GraphViz\n"
-#| " xvcg - Generate package graphs for xvcg\n"
-#| " policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| " -h This help text.\n"
-#| " -p=? The package cache.\n"
-#| " -s=? The source cache.\n"
-#| " -q Disable progress indicator.\n"
-#| " -i Show only important deps for the unmet command.\n"
-#| " -c=? Read this configuration file\n"
-#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -695,7 +659,7 @@ msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex កំហុស​ការចងក្រង​ - %s"
@@ -856,11 +820,11 @@ msgstr "កញ្ចប់ ​ត្រូវការឲ្យ​យក​ច
msgid "Internal error, Ordering didn't finish"
msgstr "កំហុស​ខាងក្នុង​ ការ​រៀប​តាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។"
@@ -889,7 +853,7 @@ msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​កា
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ"
@@ -926,7 +890,7 @@ msgstr "បោះបង់ ។"
msgid "Do you want to continue [Y/n]? "
msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n"
@@ -935,7 +899,7 @@ msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រម
msgid "Some files failed to download"
msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ"
@@ -1032,30 +996,35 @@ msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប
msgid "Selected version %s (%s) for %s\n"
msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1071,51 +1040,51 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ `apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
"ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។"
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1127,122 +1096,122 @@ msgstr ""
"ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n"
" ឬ ​បានយក​ចេញ​ពីការមកដល់ ។"
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "កញ្ចប់​ដែល​បាន​ខូច​"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "បាន​បរាជ័យ"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "ធ្វើរួច​"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "ត្រូវការ​យក​ %sB/%sB នៃ​ប័ណ្ណសារ​ប្រភព ។\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។"
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1251,30 +1220,30 @@ msgstr ""
"ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​"
"តម្រូវការ​កំណែបានឡើយ"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។"
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1291,7 +1260,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1883,7 +1852,7 @@ msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័
msgid "Unable to accept connection"
msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ"
@@ -1967,38 +1936,38 @@ msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក
msgid "Unable to connect to %s %s:"
msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "មិន​អាច​ចូល​ដំណើរការ keyring ៖ '%s'"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E ៖ បញ្ជី​អាគុយ​ម៉ង់​ពី​ Acquire::gpgv::Options too long ។ ចេញ​ ។"
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។"
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2014,81 +1983,81 @@ msgstr "មិន​អាច​បើក​បំពុង​សម្រាប
msgid "Read error from %s process"
msgstr "អាចន​កំហុស​ពី​ដំណើរការ %s"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "កំពុង​រង់ចាំ​បឋមកថា"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "យកបន្ទាត់​បឋមកថា​តែមួយ​​ ដែលលើស %u តួអក្សរ"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "ជួរ​បឋមកថា​ខូច​"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើបឋមកថាចម្លើយតបមិនត្រឹមត្រូវ"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​​បឋមកថាប្រវែង​​​មាតិកា​មិនត្រឹមត្រូវ​"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​បឋមកថា​ជួរ​មាតិកា​មិន​ត្រឹមត្រូវ​"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូច​​​ជួរ​គាំទ្រ​"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "ជ្រើស​បាន​បរាជ័យ​"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "ការតភ្ជាប់​បាន​អស់ពេល​"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
#, fuzzy
msgid "Failed to truncate file"
msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "ទិន្នន័យ​បឋមកថា​ខូច"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "កំហុស​ខាង​ក្នុង​"
@@ -2101,11 +2070,38 @@ msgstr "មិនអាច mmap ឯកសារទទេ​បានឡើយ"
msgid "Couldn't make mmap of %lu bytes"
msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
@@ -2531,7 +2527,7 @@ msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ
msgid "Method %s did not start correctly"
msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។"
@@ -2892,10 +2888,14 @@ msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង
msgid "Completely removed %s"
msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
#, fuzzy
msgid "Could not patch file"
diff --git a/po/ko.po b/po/ko.po
index 1d2a35c96..c88a5e7dd 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2008-11-13 07:14+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -154,7 +154,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s(%s), 컴파일 시각 %s %s\n"
@@ -652,7 +652,7 @@ msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "정규식 컴파일 오류 - %s"
@@ -814,11 +814,11 @@ msgstr "패키지를 지워야 하지만 지우기가 금지되어 있습니다.
msgid "Internal error, Ordering didn't finish"
msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "다운로드 디렉토리를 잠글 수 없습니다"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "소스 목록을 읽을 수 없습니다."
@@ -849,7 +849,7 @@ msgstr "이 작업 후 %s바이트의 디스크 공간을 더 사용하게 됩
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다"
@@ -889,7 +889,7 @@ msgstr "중단."
msgid "Do you want to continue [Y/n]? "
msgstr "계속 하시겠습니까 [Y/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s 파일을 받는 데 실패했습니다 %s\n"
@@ -898,7 +898,7 @@ msgstr "%s 파일을 받는 데 실패했습니다 %s\n"
msgid "Some files failed to download"
msgstr "일부 파일을 받는 데 실패했습니다"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다"
@@ -996,29 +996,34 @@ msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다"
msgid "Selected version %s (%s) for %s\n"
msgstr "%3$s 패키지의 %1$s (%2$s) 버전을 선택합니다\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "update 명령은 인수를 받지 않습니다"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "목록 디렉토리를 잠글 수 없습니다"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "다음 새 패키지가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "이들을 지우기 위해서는 'apt-get autoremove'를 사용하십시오."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1036,44 +1041,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "%s 작업를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "%s 패키지를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 패키지 수동설치로 지정합니다.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:"
# FIXME: specify a solution? 무슨 솔루션?
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1081,7 +1086,7 @@ msgstr ""
"의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 "
"(아니면 해결 방법을 지정하십시오)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1092,115 +1097,115 @@ msgstr ""
"불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n"
"아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "망가진 패키지"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "다음 패키지를 더 설치할 것입니다:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "제안하는 패키지:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "추천하는 패키지:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "업그레이드를 계산하는 중입니다... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "실패"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "완료"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s의 소스 패키지를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s에 충분한 공간이 없습니다"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "%s 소스를 가져옵니다\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "일부 아카이브를 가져오는 데 실패했습니다."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "압축 풀기 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "빌드 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "하위 프로세스가 실패했습니다"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 패키지에 빌드 의존성이 없습니다.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1209,7 +1214,7 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1218,32 +1223,33 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버"
"전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 패키지가 너"
"무 최근 버전입니다"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "빌드 의존성을 처리하는 데 실패했습니다"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "지원하는 모듈:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1259,7 +1265,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1855,7 +1861,7 @@ msgstr "데이터 소켓 연결 시간 초과"
msgid "Unable to accept connection"
msgstr "연결을 받을 수 없습니다"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "파일 해싱에 문제가 있습니다"
@@ -1939,40 +1945,40 @@ msgstr "'%s:%s'의 주소를 알아내는 데 무언가 이상한 일이 발생
msgid "Unable to connect to %s %s:"
msgstr "%s %s에 연결할 수 없습니다:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "키링에 접근할 수 없습니다: '%s'"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Acquire::gpgv::Options의 인자 목록이 너무 깁니다. 끝냅니다."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "내부 오류: 서명은 올바르지만 키 지문을 확인할 수 없습니다!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "최소한 하나 이상의 서명이 잘못되었습니다."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"서명을 확인하는 '%s' 프로그램을 실행할 수 없습니다. (gnuv 프로그램을 설치했습"
"니까?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "gpgv 실행 도중 알 수 없는 오류 발생"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "다음 서명이 올바르지 않습니다:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1988,80 +1994,80 @@ msgstr "%s에 대한 파이프를 열 수 없습니다"
msgid "Read error from %s process"
msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "헤더를 기다리는 중입니다"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "헤더 줄이 잘못되었습니다"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "데이터 형식을 알 수 없습니다"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "select가 실패했습니다"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "연결 시간이 초과했습니다"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "출력 파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "해당 파일에 쓰는 데 오류가 발생했습니다"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "서버에서 읽는 데 오류가 발생했습니다"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "파일을 자르는 데 실패했습니다"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "헤더 데이터가 잘못되었습니다"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "연결이 실패했습니다"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "내부 오류"
@@ -2074,11 +2080,38 @@ msgstr "빈 파일에 메모리 매핑할 수 없습니다"
msgid "Couldn't make mmap of %lu bytes"
msgstr "%lu바이트를 메모리 매핑할 수 없습니다"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "동적 메모리 매핑이 범위를 벗어났습니다"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "선택한 %s이(가) 없습니다"
@@ -2505,7 +2538,7 @@ msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다."
msgid "Method %s did not start correctly"
msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2866,11 +2899,15 @@ msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다"
msgid "Completely removed %s"
msgstr "%s 패키지를 완전히 지웠습니다"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"로그에 쓰는데 실패. openpty() 실패(/dev/pts가 마운트되어있지 않습니까?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "%s 파일을 열 수 없습니다"
@@ -2879,6 +2916,9 @@ msgstr "%s 파일을 열 수 없습니다"
msgid "Connection closed prematurely"
msgstr "연결이 너무 빨리 끊어졌습니다"
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "동적 메모리 매핑이 범위를 벗어났습니다"
+
#~ msgid ""
#~ "Since you only requested a single operation it is extremely likely that\n"
#~ "the package is simply not installable and a bug report against\n"
diff --git a/po/ku.po b/po/ku.po
index f7fb37a0b..5568898fb 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: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2008-05-08 12:48+0200\n"
"Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
"Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -161,7 +161,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s ji bo %s %s komkirî di %s %s de\n"
@@ -571,7 +571,7 @@ msgstr ""
msgid "Y"
msgstr "E"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -730,11 +730,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Pelrêça daxistinê nayê quflekirin"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr ""
@@ -763,7 +763,7 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nikarî cihê vala li %s tesbît bike"
@@ -797,7 +797,7 @@ msgstr "Betal."
msgid "Do you want to continue [Y/n]? "
msgstr "Dixwazî bidomînî [E/n]?"
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Anîna %s %s biserneket\n"
@@ -806,7 +806,7 @@ msgstr "Anîna %s %s biserneket\n"
msgid "Some files failed to download"
msgstr "Daxistina çend pelan biserneket"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr ""
@@ -898,30 +898,35 @@ msgstr ""
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -937,49 +942,49 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "Peywira %s nehate dîtin"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Nikarî pakêta %s bibîne"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "lê %s dê were sazkirin"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -987,152 +992,152 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Paketên şikestî"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Paketên tên pêşniyaz kirin:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Paketên tên tawsiyê kirin:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Bilindkirin tê hesibandin..."
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Serneket"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Temam"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Cihê vala li %s têre nake"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Çavkanîna %s bîne\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Anîna çend arşîvan biserneket."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1148,7 +1153,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1688,7 +1693,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1773,39 +1778,39 @@ msgstr ""
msgid "Unable to connect to %s %s:"
msgstr "Nikare bi %s re girêdan pêk bîne %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr ""
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Di xebitandina gpgv de çewtiya nenas"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1821,82 +1826,82 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Hilbijartin neserketî"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:802
+#: methods/http.cc:810
#, fuzzy
msgid "Error writing to output file"
msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Dema li pelî dihate nivîsîn çewtî"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Dema li pelî dihate nivîsîn çewtî"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
#, fuzzy
msgid "Failed to truncate file"
msgstr "Nivîsîna pelê %s biserneket"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Girêdan pêk nehatiye"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Çewtiya hundirîn"
@@ -1909,11 +1914,38 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Hilbijartina %s nehatiye dîtin"
@@ -2332,7 +2364,7 @@ msgstr ""
msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne"
@@ -2685,10 +2717,14 @@ msgstr "Bi tevahî rakirina %s tê amadekirin"
msgid "Completely removed %s"
msgstr "%s bi tevahî hatine rakirin"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
#, fuzzy
msgid "Could not patch file"
diff --git a/po/lt.po b/po/lt.po
index 8eb2c5adb..ffef7eb2f 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -1998,8 +1998,11 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
msgstr ""
#: apt-pkg/contrib/strutl.cc:1014
diff --git a/po/mr.po b/po/mr.po
index 12a2575c3..7b490dca9 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2008-11-20 23:27+0530\n"
"Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
"Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -156,7 +156,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s हे %s करिता %s %s वर संग्रहित\n"
@@ -652,7 +652,7 @@ msgstr "%s ला पुनर्नामांकन %s करण्यास
msgid "Y"
msgstr "होय"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
@@ -813,11 +813,11 @@ msgstr "पॅकेजेस कायमची काढायची आहे
msgid "Internal error, Ordering didn't finish"
msgstr "अंतर्गत त्रुटी,क्रम अजून संपला नाही"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "उगमांच्या याद्या वाचता येणार नाहीत."
@@ -846,7 +846,7 @@ msgstr "या क्रियेनंतर, %sB एवढी अधिक ड
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "या क्रियेनंतर, %sB डिस्क जागा मोकळी होईल.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही"
@@ -883,7 +883,7 @@ msgstr "व्यत्यय/बंद करा."
msgid "Do you want to continue [Y/n]? "
msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s आणणे असफल\n"
@@ -892,7 +892,7 @@ msgstr "%s %s आणणे असफल\n"
msgid "Some files failed to download"
msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती"
@@ -990,29 +990,34 @@ msgstr "'%s' साठी '%s' आवृत्ती सापडली ना
msgid "Selected version %s (%s) for %s\n"
msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही."
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "आपण या गोष्टी काढून टाकता नये, ऑटोरिमूव्हर सुरू करता येत नाही"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1030,45 +1035,45 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "अंतर्गत त्रुटी, AutoRemoverने स्टफला तोडले"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "%s कार्य सापडू शकले नाही"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "%s पॅकेज सापडू शकले नाही"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"तुम्हाला कदाचित `apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा "
"लागेल'यात बदल करण्यासाठी:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1076,7 +1081,7 @@ msgstr ""
"अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन (`apt-get -f install') पॅकेजशिवाय प्रयत्न करा "
"(किंवा पर्याय सांगा)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1088,122 +1093,122 @@ msgstr ""
"विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n"
"किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "तुटलेली पॅकेजेस"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "सुचवलेली पॅकेजेस:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "शिफारस केलेली पॅकेजेस:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "पुढिल आवृत्तीची गणती करीत आहे..."
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "असमर्थ"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "झाले"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s मध्ये पुरेशी जागा नाही"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "%s उगम घ्या\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "काही अर्काईव्हज आणण्यास असमर्थ."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "चाईल्ड प्रक्रिया अयशस्वी"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1212,30 +1217,31 @@ msgstr ""
"आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s "
"डिपेंडन्सी पूर्ण होऊ शकत नाही"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ "
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1251,7 +1257,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1848,7 +1854,7 @@ msgstr "डेटा सॉकेट जोडणी वेळेअभावी
msgid "Unable to accept connection"
msgstr "जोडणी स्विकारण्यास असमर्थ"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "फाईल हॅश करण्यात त्रुटी"
@@ -1932,40 +1938,40 @@ msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना क
msgid "Unable to connect to %s %s:"
msgstr "%s %s ला जोडण्यास असमर्थ:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "'%s': कीरिंग पर्यंत पोहोचू शकत नाही"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"दोष: ::gpgv:: कडून प्राप्त झालेला ऑर्गुमेंट सूचीचा पर्याय खूप लांबीचा. बाहेर पडत आहे."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "किमान एक अवैध सही सापडली."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "खालील सह्या अवैध आहेत:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1981,80 +1987,80 @@ msgstr "%s साठी पाईप उघडता येत नाही"
msgid "Read error from %s process"
msgstr "%s क्रियेपासून चूक वाचा"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "शीर्षकासाठी थांबले आहे...."
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "%u अक्षरांवर एक शीर्षक ओळ मिळाली"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "वाईट शीर्षक ओळ"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP सर्व्हरने अवैध प्रत्त्युत्तर शीर्षक पाठविले"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP सर्व्हरने अवैध मजकूर-लांबी शीर्षक पाठविले "
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP सर्व्हरने अवैध मजकूर-विस्तार शीर्षक पाठविले"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "HTTP सर्व्हरने विस्तार तांत्रिक मदत जोडली"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "अपरिचित दिनांक प्रकार/स्वरूप "
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "चुकले/असमर्थ निवड करा"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "जोडणी वेळेअभावी तुटली"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "सर्व्हर मधून वाचण्यात चूक"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "फाईल छोटी करणे असफल"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "चुकीचा शीर्षक डाटा"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "जोडणी अयशस्वी"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "अंतर्गत त्रुटी"
@@ -2067,11 +2073,38 @@ msgstr "रिकामी फाईल mmap करता येणार ना
msgid "Couldn't make mmap of %lu bytes"
msgstr "mmap चे %lu बाईटस् करता येणार नाहीत"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Dynamic MMap ला ज आगा कमी पडली"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "%s निवडक भाग सापडत नाही"
@@ -2498,7 +2531,7 @@ msgstr "%s कार्यपध्दतीचा ड्राइव्हर
msgid "Method %s did not start correctly"
msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा."
@@ -2866,10 +2899,14 @@ msgstr "%s संपूर्ण काढून टाकण्याची त
msgid "Completely removed %s"
msgstr "%s संपूर्ण काढून टाकले"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "सत्रनोंद लिहिता येत नाही, openpty() असफल (/dev/pts आरोहित नाही?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "फाईल पॅच करता आली नाही"
@@ -2878,6 +2915,9 @@ msgstr "फाईल पॅच करता आली नाही"
msgid "Connection closed prematurely"
msgstr "जोडणी अकाली बंद झाली"
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Dynamic MMap ला ज आगा कमी पडली"
+
#~ msgid ""
#~ "Since you only requested a single operation it is extremely likely that\n"
#~ "the package is simply not installable and a bug report against\n"
diff --git a/po/nb.po b/po/nb.po
index 1f218850f..da7b86b38 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2009-02-01 18:26+0100\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n"
@@ -164,7 +164,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s kompilert p %s %s\n"
@@ -662,7 +662,7 @@ msgstr "Klarte ikke endre navnet p %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Kompileringsfeil i regulrt uttrykk - %s"
@@ -823,11 +823,11 @@ msgstr "Pakker trenges fjernes, men funksjonen er sltt av."
msgid "Internal error, Ordering didn't finish"
msgstr "Intern feil, sortering fullfrte ikke"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Klarer ikke lse nedlastingsmappa"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Kan ikke lese kildlista."
@@ -858,7 +858,7 @@ msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Klarte ikke bestemme ledig plass i %s"
@@ -896,7 +896,7 @@ msgstr "Avbryter."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortsette [Y/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikke skaffe %s %s\n"
@@ -905,7 +905,7 @@ msgstr "Klarte ikke skaffe %s %s\n"
msgid "Some files failed to download"
msgstr "Noen av filene kunne ikke lastes ned"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Nedlasting fullfrt med innstillinga bare nedlasting"
@@ -1003,29 +1003,34 @@ msgstr "Versjon %s av %s ble ikke funnet"
msgid "Selected version %s (%s) for %s\n"
msgstr "Utvalgt versjon %s (%s) for %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "Oppdaterings-kommandoen tar ingen argumenter"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Kan ikke lse listemappa"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Flgende pakker ble automatisk installert og er ikke lenger pkrevet:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Bruk apt-get autoremove for fjerne dem."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1043,43 +1048,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "Flgende informasjon kan vre til hjelp med lse problemet:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Intern feil, autofjerneren (AutoRemover) dela noe"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern feil - AllUpgrade dela noe"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "Klarte ikke finne oppgave %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Klarte ikke finne pakken %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, velger %s istedenfor det regulre uttrykket %s\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s satt til manuell installasjon.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du vil kanskje utfre apt-get -f install for rette p disse:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1087,7 +1092,7 @@ msgstr ""
"Uinnfridde avhengighetsforhold. Prv apt-get -f install uten pakker (eller "
"angi en lsning)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1099,122 +1104,122 @@ msgstr ""
"at visse kjernepakker enn ikke er laget eller flyttet ut av Incoming for\n"
"distribusjonen."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "delagte pakker"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Flgende ekstra pakker vil bli installert."
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Foresltte pakker:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Anbefalte pakker"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Beregner oppgradering... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Mislyktes"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Utfrt"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil, problemlser dela noe"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "Du m angi minst en pakke du vil ha kildekoden til"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Klarer ikke finne en kildekodepakke for %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hopper over allerede nedlastet fil %s\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikke nok ledig plass i %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Trenger skaffe %sB av %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Trenger skaffe %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Skaffer kildekode %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Klarte ikke skaffe alle arkivene."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Omgr utpakking av allerede utpakket kilde i %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislyktes.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Sjekk om pakken dpkg-dev er installert.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggekommandoen %s mislyktes.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Barneprosessen mislyktes"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr "Du m angi minst en pakke du vil sjekke builddeps for"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarer ikke skaffe informasjon om bygge-avhengighetene for %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen avhengigheter.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1223,32 +1228,33 @@ msgstr ""
"Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige "
"versjoner av pakken %s som oppfyller versjonskravene"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Klarte ikke tilfredsstille %s avhengighet for %s: den installerte pakken %"
"s er for ny"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikke tilfredsstille %s avhengighet for %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Klarte ikke tilfredstille bygg-avhengighetene for %s."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Klarte ikke behandle forutsetningene for bygging"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Stttede moduler:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1264,7 +1270,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1868,7 +1874,7 @@ msgstr "Tidsavbrudd p tilkoblingen til datasokkelen"
msgid "Unable to accept connection"
msgstr "Klarte ikke godta tilkoblingen"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nkkel for fil"
@@ -1952,39 +1958,39 @@ msgstr "Noe galt skjedde ved oppslag av %s:%s (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Klarte ikke koble til %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Klarte ikke sl opp i nkkelring; %s"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Argumentliste fra Acquire::gpgv::Options for lang. Avbryter."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Intern feil: God signatur, men kunne bestemme nkkelfingeravtrykk?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "Minst en ugyldig signatur ble funnet."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Klarte ikke kjre %s for verifisere signaturen (er gpgv installert?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Ukjent feil ved kjring av gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "De flgende signaturene var ugyldige:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2002,80 +2008,80 @@ msgstr "Klarte ikke pne rr for %s"
msgid "Read error from %s process"
msgstr "Lesefeil fra %s-prosessen"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Venter p hoder"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fikk en enkel hodelinje over %u tegn"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "delagt hodelinje"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-tjeneren sendte et ugyldig svarhode"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-tjeneren sendte et ugyldig Content-Length-hode"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-tjeneren sendte et ugyldig Content-Range-hode"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tjeneren har delagt sttte for omrde"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Ukjent datoformat"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Utvalget mislykkes"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Tidsavbrudd p forbindelsen"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Feil ved lesing fra tjeneren"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "Klarte ikke forkorte fila %s"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "delagte hodedata"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Forbindelsen mislykkes"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Intern feil"
@@ -2088,11 +2094,40 @@ msgstr "Kan ikke utfre mmap p en tom fil"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunne ikke lage mmap av %lu bytes"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Dynamisk MMap gikk tom for minne"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Dynamisk MMap gikk tom for minne. k strrelsen p APT::Cache-Limit. "
+"Nvrende verdi: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Fant ikke utvalget %s"
@@ -2519,7 +2554,7 @@ msgstr "Finner ikke metode-driveren %s."
msgid "Method %s did not start correctly"
msgstr "Metoden %s startet ikke korrekt"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Sett inn disken merket %s i lagringsenheten %s og trykk Enter."
@@ -2883,10 +2918,14 @@ msgstr "Forbereder fullstendig slette %s"
msgid "Completely removed %s"
msgstr "Fjernet %s fullstendig"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Klarte ikke skrive logg, openpty() feilet (/dev/pts ikke montert?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Kunne ikke pne fila %s"
@@ -2895,12 +2934,8 @@ msgstr "Kunne ikke pne fila %s"
msgid "Connection closed prematurely"
msgstr "Forbindelsen ble uventet stengt"
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "Dynamisk MMap gikk tom for minne. k strrelsen p APT::Cache-Limit. "
-#~ "Nvrende verdi: %lu. (man 5 apt.conf)"
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Dynamisk MMap gikk tom for minne"
#~ msgid ""
#~ "Since you only requested a single operation it is extremely likely that\n"
diff --git a/po/ne.po b/po/ne.po
index 7563fb3ef..16afad651 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: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2006-06-12 14:35+0545\n"
"Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
"Language-Team: Nepali <info@mpp.org.np>\n"
@@ -159,49 +159,13 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s को लागि %s %s, %s %s मा कम्पाएल गरिएको छ\n"
#: cmdline/apt-cache.cc:1721
#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| " apt-cache [options] add file1 [file2 ...]\n"
-#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| " add - Add a package file to the source cache\n"
-#| " gencaches - Build both the package and source cache\n"
-#| " showpkg - Show some general information for a single package\n"
-#| " showsrc - Show source records\n"
-#| " stats - Show some basic statistics\n"
-#| " dump - Show the entire file in a terse form\n"
-#| " dumpavail - Print an available file to stdout\n"
-#| " unmet - Show unmet dependencies\n"
-#| " search - Search the package list for a regex pattern\n"
-#| " show - Show a readable record for the package\n"
-#| " depends - Show raw dependency information for a package\n"
-#| " rdepends - Show reverse dependency information for a package\n"
-#| " pkgnames - List the names of all packages\n"
-#| " dotty - Generate package graphs for GraphViz\n"
-#| " xvcg - Generate package graphs for xvcg\n"
-#| " policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| " -h This help text.\n"
-#| " -p=? The package cache.\n"
-#| " -s=? The source cache.\n"
-#| " -q Disable progress indicator.\n"
-#| " -i Show only important deps for the unmet command.\n"
-#| " -c=? Read this configuration file\n"
-#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -693,7 +657,7 @@ msgstr " %s मा %s पुन:नामकरण असफल भयो"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
@@ -854,11 +818,11 @@ msgstr "प्याकेजहरू हट्न चाहदैछन् त
msgid "Internal error, Ordering didn't finish"
msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।"
@@ -887,7 +851,7 @@ msgstr "अनप्याक गरिसके पछि थप डिस्
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन"
@@ -924,7 +888,7 @@ msgstr "परित्याग गर्नुहोस् ।"
msgid "Do you want to continue [Y/n]? "
msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "%s %s तान्न असफल भयो\n"
@@ -933,7 +897,7 @@ msgstr "%s %s तान्न असफल भयो\n"
msgid "Some files failed to download"
msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ"
@@ -1030,30 +994,35 @@ msgstr " '%s' को लागि '%s' संस्करण फेला पा
msgid "Selected version %s (%s) for %s\n"
msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1069,44 +1038,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: "
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "तर %s स्थापना हुनुपर्यो"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "तपाईँ यसलाई सुधार गर्न `apt-get -f install' चलाउन चाहनुहुन्छ:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1114,7 +1083,7 @@ msgstr ""
"नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा "
"समाधान निर्दिष्ट गर्नुहोस्) ।"
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1127,122 +1096,122 @@ msgstr ""
" वितरण अहिले सम्म सिर्जना\n"
" भएको छैन वा आवगमन विनानै सर्यो ।"
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "भाँचिएका प्याकेजहरू"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "सुझाव दिएका प्याकेजहरू:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "सिफारिस गरिएका प्याकेजहरू:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "स्तर वृद्धि गणना गरिदैछ..."
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "असफल भयो"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "काम भयो"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "स्रोत फड्काउनुहोस् %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "केही संग्रह फड्काउन असफल भयो ।"
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "अनप्याक आदेश '%s' असफल भयो ।\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "निर्माण आदेश '%s' असफल भयो ।\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "शाखा प्रक्रिया असफल भयो"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1251,30 +1220,30 @@ msgstr ""
"%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण "
"आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन "
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । "
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "समर्थित मोड्युलहरू:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1291,7 +1260,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1886,7 +1855,7 @@ msgstr "डेटा सकेटको जडान समय सकियो"
msgid "Unable to accept connection"
msgstr "जडान स्वीकार गर्न असक्षम भयो"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "समस्या द्रुतान्वेषण फाइल"
@@ -1970,38 +1939,38 @@ msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट
msgid "Unable to connect to %s %s:"
msgstr "%s %s मा जडान गर्न असफल भयो:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "कुञ्जी घण्टी पहुँच गर्न सकिएन: '%s'"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: प्राप्त गर्नेबाट तर्क सूचि::gpgv::अति लामो विकल्पहरू अवस्थित छ ।"
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।"
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2017,81 +1986,81 @@ msgstr "%s को लागि पाइप खोल्न सकिएन"
msgid "Read error from %s process"
msgstr "%s प्रक्रियाबाट त्रुटि पढ्नुहोस् "
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "हेडरहरुको लागि पर्खिदैछ"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr " %u chars माथि एकल हेडर लाइन प्राप्त गर्नुहोस्"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "खराब हेडर लाइन"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP सर्भरले अवैध जवाफ हेडर पठायो"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP सर्भरले अवैध सामग्री-लम्बाई हेडर पठायो"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP सर्भरले अवैध सामग्री-दायरा हेडर पठायो"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "HTTP सर्भर संग भाँचिएको दायरा समर्थन छ"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "अज्ञात मिति ढाँचा"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "असफल चयन गर्नुहोस्"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "जडान समय सकियो"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "फाइलमा त्रुटि लेखिदैछ"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "फाइलमा त्रुटि लेखिदैछ"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "सर्भरबाट त्रुटि पढिदैछ"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
#, fuzzy
msgid "Failed to truncate file"
msgstr "फाइल %s लेख्न असफल भयो"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "खराब हेडर डेटा"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "जडान असफल भयो"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "आन्तरिक त्रुटि"
@@ -2104,11 +2073,38 @@ msgstr "एउटा खाली फाइल mmap बनाउन सकिए
msgid "Couldn't make mmap of %lu bytes"
msgstr "%lu बाइटहरुको mmap बनाउन सकिएन"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "चयन %s फेला पार्न सकिएन"
@@ -2535,7 +2531,7 @@ msgstr "विधि ड्राइभर %s फेला पार्न स
msgid "Method %s did not start correctly"
msgstr "विधि %s सही रुपले सुरू हुन सकेन"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "
@@ -2897,10 +2893,14 @@ msgstr " %s पूर्ण रुपले हटाउन तयार गर
msgid "Completely removed %s"
msgstr " %s पूर्ण रुपले हट्यो"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
#, fuzzy
msgid "Could not patch file"
diff --git a/po/nl.po b/po/nl.po
index 58785fb5f..c4b471356 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2008-05-05 18:39+0200\n"
"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -157,49 +157,13 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s voor %s gecompileerd op %s %s\n"
#: cmdline/apt-cache.cc:1721
#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| " apt-cache [options] add file1 [file2 ...]\n"
-#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| " add - Add a package file to the source cache\n"
-#| " gencaches - Build both the package and source cache\n"
-#| " showpkg - Show some general information for a single package\n"
-#| " showsrc - Show source records\n"
-#| " stats - Show some basic statistics\n"
-#| " dump - Show the entire file in a terse form\n"
-#| " dumpavail - Print an available file to stdout\n"
-#| " unmet - Show unmet dependencies\n"
-#| " search - Search the package list for a regex pattern\n"
-#| " show - Show a readable record for the package\n"
-#| " depends - Show raw dependency information for a package\n"
-#| " rdepends - Show reverse dependency information for a package\n"
-#| " pkgnames - List the names of all packages\n"
-#| " dotty - Generate package graphs for GraphViz\n"
-#| " xvcg - Generate package graphs for xvcg\n"
-#| " policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| " -h This help text.\n"
-#| " -p=? The package cache.\n"
-#| " -s=? The source cache.\n"
-#| " -q Disable progress indicator.\n"
-#| " -i Show only important deps for the unmet command.\n"
-#| " -c=? Read this configuration file\n"
-#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -698,7 +662,7 @@ msgstr "Hernoemen van %s naar %s is mislukt"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-compilatiefout - %s"
@@ -860,11 +824,11 @@ msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
msgid "Internal error, Ordering didn't finish"
msgstr "Interne fout, rangschikken is niet voltooid"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Kon de ophaalmap niet vergrendelen"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "De lijst van bronnen kon niet gelezen worden."
@@ -895,7 +859,7 @@ msgstr "Door deze operatie zal er %sB extra schijfruimte gebruikt worden.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen"
@@ -932,7 +896,7 @@ msgstr "Afbreken."
msgid "Do you want to continue [Y/n]? "
msgstr "Wilt u doorgaan [J/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ophalen van %s %s is mislukt\n"
@@ -941,7 +905,7 @@ msgstr "Ophalen van %s %s is mislukt\n"
msgid "Some files failed to download"
msgstr "Ophalen van sommige bestanden is mislukt"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
@@ -1041,19 +1005,24 @@ msgstr "Versie '%s' voor '%s' is niet gevonden"
msgid "Selected version %s (%s) for %s\n"
msgstr "Versie %s (%s) geselecteerd voor %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "De 'update'-opdracht aanvaard geen argumenten"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Kon de lijst-map niet vergrendelen"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1061,11 +1030,11 @@ msgstr ""
"De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer "
"nodig:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "U kunt deze verwijderen via 'apt-get autoremove'."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1083,45 +1052,45 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "De volgende informatie helpt u mogelijk verder:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "Kon taak %s niet vinden"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Kon pakket %s niet vinden"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s is ingesteld voor handmatige installatie.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te "
"lossen:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1129,7 +1098,7 @@ msgstr ""
"Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren "
"zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1140,119 +1109,119 @@ msgstr ""
"een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n"
"gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Niet-werkende pakketten:"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "De volgende extra pakketten zullen geïnstalleerd worden:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Voorgestelde pakketten:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Aanbevolen pakketten:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Opwaardering wordt doorgerekend... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Mislukt"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Klaar"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr ""
"U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet "
"worden"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kan geen bronpakket vinden voor %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "U heeft niet voldoende vrije schijfruimte op %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Moet %sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Ophalen bron %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Ophalen van sommige archieven is mislukt."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uitpakopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Bouwopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Dochterproces is mislukt"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"U dient tenminste één pakket op te geven om de bouwvereisten van te "
"controleren"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s heeft geen bouwvereisten.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1261,7 +1230,7 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
"onvindbaar is"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1270,32 +1239,33 @@ msgstr ""
"De vereiste %s van pakket %s kan niet voldaan worden omdat er geen "
"beschikbare versies zijn van pakket %s die aan de versievereisten voldoen"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s "
"is te nieuw"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bouwvereisten voor %s konden niet voldaan worden."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Verwerken van de bouwvereisten is mislukt"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Ondersteunde modules:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1311,7 +1281,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1922,7 +1892,7 @@ msgstr "Datasocket verbinding is verlopen"
msgid "Unable to accept connection"
msgstr "Kan de verbinding niet aanvaarden"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probleem bij het hashen van het bestand"
@@ -2006,44 +1976,44 @@ msgstr "Er gebeurde iets raars bij het zoeken naar '%s:%s' (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Kan niet verbinden met %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Kon de sleutelring niet benaderen: '%s'"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"F: argumentenlijst van Acquire::gpv::Options was te lang. Er wordt "
"afgesloten."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Interne fout: ondertekening is goed maar kon de vingerafdruk van de sleutel\n"
"niet bepalen?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "Er is tenminste één ongeldige ondertekening gevonden."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Kon '%s' niet uitvoeren om ondertekening te verifiëren (is gpgv "
"geïnstalleerd?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Onbekende fout bij het uitvoeren van gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "De volgende ondertekeningen waren ongeldig:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2061,84 +2031,84 @@ msgstr "Kon geen pijp openen voor %s"
msgid "Read error from %s process"
msgstr "Leesfout door proces %s"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Wachtend op de kopteksten"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Foute koptekstregel"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
"Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
"Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Onbekend datumformaat"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Selectie is mislukt"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Verbinding verliep"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Fout bij het schrijven naar het uitvoerbestand"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Fout bij het schrijven naar bestand"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Fout bij het schrijven naar het bestand"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Fout bij het lezen van de server, andere kant heeft de verbinding gesloten"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Fout bij het lezen van de server"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
#, fuzzy
msgid "Failed to truncate file"
msgstr "Wegschrijven van bestand %s is mislukt"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Foute koptekstdata"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Verbinding mislukt"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Interne fout"
@@ -2151,11 +2121,38 @@ msgstr "Kan een leeg bestand niet mmappen"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kon van %lu bytes geen mmap maken"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Selectie %s niet gevonden"
@@ -2591,7 +2588,7 @@ msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
msgid "Method %s did not start correctly"
msgstr "Methode %s startte niet op de juiste manier"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2967,12 +2964,16 @@ msgstr "Volledige verwijdering van %s wordt voorbereid"
msgid "Completely removed %s"
msgstr "%s is volledig verwijderd"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Kon logbestand niet wegschrijven, openpty() is mislukt (/dev/pts niet "
"aangekoppeld?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Kon bestand niet patchen"
diff --git a/po/nn.po b/po/nn.po
index 27d718f09..f68021ead 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_nn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -161,49 +161,13 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s %s kompilert p %s %s\n"
#: cmdline/apt-cache.cc:1721
#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| " apt-cache [options] add file1 [file2 ...]\n"
-#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| " add - Add a package file to the source cache\n"
-#| " gencaches - Build both the package and source cache\n"
-#| " showpkg - Show some general information for a single package\n"
-#| " showsrc - Show source records\n"
-#| " stats - Show some basic statistics\n"
-#| " dump - Show the entire file in a terse form\n"
-#| " dumpavail - Print an available file to stdout\n"
-#| " unmet - Show unmet dependencies\n"
-#| " search - Search the package list for a regex pattern\n"
-#| " show - Show a readable record for the package\n"
-#| " depends - Show raw dependency information for a package\n"
-#| " rdepends - Show reverse dependency information for a package\n"
-#| " pkgnames - List the names of all packages\n"
-#| " dotty - Generate package graphs for GraphViz\n"
-#| " xvcg - Generate package graphs for xvcg\n"
-#| " policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| " -h This help text.\n"
-#| " -p=? The package cache.\n"
-#| " -s=? The source cache.\n"
-#| " -q Disable progress indicator.\n"
-#| " -i Show only important deps for the unmet command.\n"
-#| " -c=? Read this configuration file\n"
-#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -695,7 +659,7 @@ msgstr "Klarte ikkje endra namnet p %s til %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex-kompileringsfeil - %s"
@@ -858,11 +822,11 @@ msgstr "Nokre pakkar m fjernast, men fjerning er sltt av."
msgid "Internal error, Ordering didn't finish"
msgstr "Intern feil ved tilleggjing av avleiing"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Klarte ikkje lsa nedlastingskatalogen"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Kjeldelista kan ikkje lesast."
@@ -891,7 +855,7 @@ msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
@@ -929,7 +893,7 @@ msgstr "Avbryt."
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du halda fram [J/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Klarte ikkje henta %s %s\n"
@@ -938,7 +902,7 @@ msgstr "Klarte ikkje henta %s %s\n"
msgid "Some files failed to download"
msgstr "Klarte ikkje henta nokre av filene"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Nedlastinga er ferdig i nedlastingsmodus"
@@ -1037,30 +1001,35 @@ msgstr "Fann ikkje versjonen %s av %s"
msgid "Selected version %s (%s) for %s\n"
msgstr "Vald versjon %s (%s) for %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "Oppdateringskommandoen tek ingen argument"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Klarte ikkje lsa listekatalogen"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Dei flgjande NYE pakkane vil verta installerte:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1076,44 +1045,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Intern feil. AllUpgrade ydelagde noko"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Intern feil. AllUpgrade ydelagde noko"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, vel %s i staden for regex %s\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "men %s skal installerast"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du vil kanskje prva retta p desse ved kyra apt-get -f install."
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1121,7 +1090,7 @@ msgstr ""
"Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja "
"ei lysing)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1133,123 +1102,123 @@ msgstr ""
"distribusjonen, kan det g henda at nokre av pakkane som trengst ikkje\n"
"er laga enno eller at dei framleis ligg i Incoming."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "ydelagde pakkar"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Dei flgjande tilleggspakkane vil verta installerte:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Fresltte pakkar:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Tilrdde pakkar"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Reknar ut oppgradering ... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Mislukkast"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Ferdig"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil. AllUpgrade ydelagde noko"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Finn ingen kjeldepakke for %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har ikkje nok ledig plass i %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "M henta %sB/%sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "M henta %sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Hent kjeldekode %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Klarte ikkje henta nokre av arkiva."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggjekommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Barneprosessen mislukkast"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr "Du m velja minst ein pakke som byggjekrava skal sjekkast for"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarte ikkje henta byggjekrav for %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen byggjekrav.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1258,31 +1227,31 @@ msgstr ""
"Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon "
"tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Klarte ikkje behandla byggjekrava"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Sttta modular:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1299,7 +1268,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1898,7 +1867,7 @@ msgstr "Tidsavbrot p tilkopling til datasokkel"
msgid "Unable to accept connection"
msgstr "Klarte ikkje godta tilkoplinga"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nkkel for fil"
@@ -1982,39 +1951,39 @@ msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Klarte ikkje kopla til %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, fuzzy, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Klarte ikkje sl opp %s"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Dei flgjande tilleggspakkane vil verta installerte:"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2030,81 +1999,81 @@ msgstr "Klarte ikkje opna ryr for %s"
msgid "Read error from %s process"
msgstr "Lesefeil fr %s-prosessen"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Ventar p hovud"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Fekk ei enkel hovudlinje over %u teikn"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "ydelagd hovudlinje"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-tenaren sende eit ugyldig svarhovud"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-tenaren sende eit ugyldig Content-Length-hovud"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-tenaren sende eit ugyldig Content-Range-hovud"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tenaren har ydelagd sttte for omrde"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Ukjend datoformat"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Utvalet mislukkast"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Tidsavbrot p sambandet"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Feil ved lesing fr tenaren"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
#, fuzzy
msgid "Failed to truncate file"
msgstr "Klarte ikkje skriva fila %s"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "ydelagde hovuddata"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Sambandet mislukkast"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Intern feil"
@@ -2117,11 +2086,38 @@ msgstr "Kan ikkje utfra mmap p ei tom fil"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Klarte ikkje laga mmap av %lu byte"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Fann ikkje utvalet %s"
@@ -2550,7 +2546,7 @@ msgstr "Finn ikkje metodedrivaren %s."
msgid "Method %s did not start correctly"
msgstr "Metoden %s starta ikkje rett"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2916,10 +2912,14 @@ msgstr "Opnar oppsettsfila %s"
msgid "Completely removed %s"
msgstr "Klarte ikkje fjerna %s"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
#, fuzzy
msgid "Could not patch file"
diff --git a/po/pl.po b/po/pl.po
index 701c93c54..5174d6f4f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.14\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2008-11-13 17:10+0100\n"
"Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n"
"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -161,7 +161,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s dla %s skompilowany %s %s\n"
@@ -661,7 +661,7 @@ msgstr "Nie udało się zmienić nazwy %s na %s"
msgid "Y"
msgstr "T"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Błąd kompilacji wyrażenia regularnego - %s"
@@ -822,11 +822,11 @@ msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone."
msgid "Internal error, Ordering didn't finish"
msgstr "Błąd wewnętrzny, sortowanie niezakończone"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Nie udało się zablokować katalogu pobierania"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Nie udało się odczytać list źródeł."
@@ -857,7 +857,7 @@ msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nie udało się ustalić ilości wolnego miejsca w %s"
@@ -894,7 +894,7 @@ msgstr "Przerwane."
msgid "Do you want to continue [Y/n]? "
msgstr "Kontynuować [T/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nie udało się pobrać %s %s\n"
@@ -903,7 +903,7 @@ msgstr "Nie udało się pobrać %s %s\n"
msgid "Some files failed to download"
msgstr "Nie udało się pobrać niektórych plików"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Ukończono pobieranie w trybie samego pobierania"
@@ -1002,19 +1002,24 @@ msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona"
msgid "Selected version %s (%s) for %s\n"
msgstr "Wybrano wersję %s (%s) dla %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "Polecenie update nie wymaga żadnych argumentów"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Nie udało się zablokować katalogu list"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1022,11 +1027,11 @@ msgstr ""
"Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej "
"wymagane:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Aby je usunąć należy użyć \"apt-get autoremove\"."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1044,43 +1049,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Błąd wewnętrzny, AutoRemover wszystko popsuł"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Błąd wewnętrzny, AllUpgrade wszystko popsuło"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "Nie udało się odnaleźć zadania %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Nie udało się odnaleźć pakietu %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Uwaga, wybieranie %s za wyrażenie \"%s\"\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s zaznaczony jako zainstalowany ręcznie.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1088,7 +1093,7 @@ msgstr ""
"Niespełnione zależności. Proszę spróbować \"apt-get -f install\" bez "
"pakietów (lub podać rozwiązanie)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1100,120 +1105,120 @@ msgstr ""
"w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n"
"z katalogu Incoming (\"Przychodzące\")."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Pakiety są uszkodzone"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Sugerowane pakiety:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Polecane pakiety:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Obliczanie aktualizacji..."
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Nie udało się"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Gotowe"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "Błąd wewnętrzny, rozwiązywanie problemów wszystko popsuło"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane "
"źródła"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nie udało się odnaleźć źródła dla pakietu %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Pomijanie już pobranego pliku \"%s\"\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "W %s nie ma wystarczającej ilości wolnego miejsca"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Konieczne pobranie %sB archiwów źródeł.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Pobierz źródło %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Nie udało się pobrać niektórych archiwów."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Polecenie budowania \"%s\" zawiodło.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Proces potomny zawiódł"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone "
"zależności na czas budowania"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Nie udało się pobrać informacji o zależnościach na czas budowania dla %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nie ma zależności czasu budowania.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1222,7 +1227,7 @@ msgstr ""
"Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono "
"pakietu %s"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1231,32 +1236,33 @@ msgstr ""
"Zależność %s od %s nie może zostać spełniona, ponieważ żadna z dostępnych "
"wersji pakietu %s nie ma odpowiedniej wersji"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt "
"nowy"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Nie udało się spełnić zależności %s od %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Nie udało się spełnić zależności na czas budowania od %s."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Nie udało się przetworzyć zależności na czas budowania"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Obsługiwane moduły:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1272,7 +1278,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1877,7 +1883,7 @@ msgstr "Przekroczony czas połączenia gniazda danych"
msgid "Unable to accept connection"
msgstr "Nie udało się przyjąć połączenia"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Nie udało się obliczyć skrótu pliku"
@@ -1961,42 +1967,42 @@ msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Nie udało się połączyć z %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Nie udało się uzyskać dostępu do bazy kluczy: \"%s\""
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Lista argumentów Acquire::gpgv::Options zbyt długa. Zakończenie."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Błąd wewnętrzny: Prawidłowy podpis, ale nie nie udało się ustalić odcisku "
"klucza?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Nie udało się uruchomić \"%s\" by zweryfikować podpis (czy gpgv jest "
"zainstalowane?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Nieznany błąd podczas uruchamiania gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "Następujące podpisy były błędne:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2014,80 +2020,80 @@ msgstr "Nie udało się otworzyć potoku dla %s"
msgid "Read error from %s process"
msgstr "Błąd odczytu z procesu %s"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Oczekiwanie na nagłówki"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Otrzymano pojedynczą linię nagłówka o długości ponad %u znaków"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Nieprawidłowa linia nagłówka"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek odpowiedzi"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Length"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Range"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Nieznany format daty"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Operacja select nie powiodła się"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Przekroczenie czasu połączenia"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Błąd przy pisaniu do pliku wyjściowego"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Błąd przy pisaniu do pliku"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Błąd przy pisaniu do pliku"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Błąd czytania z serwera"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "Nie udało się uciąć zawartości pliku %s"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Błędne dane nagłówka"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Połączenie nie udało się"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Błąd wewnętrzny"
@@ -2100,11 +2106,38 @@ msgstr "Nie można wykonać mmap na pustym pliku"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nie udało się wykonać mmap %lu bajtów"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Brak miejsca dla dynamicznego MMap"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Nie odnaleziono wyboru %s"
@@ -2533,7 +2566,7 @@ msgstr "Nie udało się odnaleźć sterownika metody %s."
msgid "Method %s did not start correctly"
msgstr "Metoda %s nie uruchomiła się poprawnie"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Proszę włożyć do napędu \"%s\" dysk o nazwie: \"%s\" i nacisnąć enter."
@@ -2898,12 +2931,16 @@ msgstr "Przygotowanie do całkowitego usunięcia %s"
msgid "Completely removed %s"
msgstr "Całkowicie usunięto %s"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Nie można zapisać dziennika, openpty() nie powiodło się (/dev/pts nie "
"zamontowane?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Nie udało się nałożyć łatki na plik"
@@ -2912,6 +2949,9 @@ msgstr "Nie udało się nałożyć łatki na plik"
msgid "Connection closed prematurely"
msgstr "Połączenie zostało zamknięte przedwcześnie"
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Brak miejsca dla dynamicznego MMap"
+
#~ msgid ""
#~ "Since you only requested a single operation it is extremely likely that\n"
#~ "the package is simply not installable and a bug report against\n"
diff --git a/po/pt.po b/po/pt.po
index d96323935..5d1ef1d63 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2008-09-09 20:54+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -157,7 +157,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s compilado em %s %s\n"
@@ -657,7 +657,7 @@ msgstr "Falhou renomear %s para %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -818,11 +818,11 @@ msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado."
msgid "Internal error, Ordering didn't finish"
msgstr "Erro Interno, Ordering não terminou"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Impossível criar acesso exclusivo ao directório de downloads"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pôde ser lida."
@@ -853,7 +853,7 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Após esta operação, será libertado %sB de espaço em disco.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Não foi possível determinar o espaço livre em %s"
@@ -890,7 +890,7 @@ msgstr "Abortado."
msgid "Do you want to continue [Y/n]? "
msgstr "Deseja continuar [Y/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falhou obter %s %s\n"
@@ -899,7 +899,7 @@ msgstr "Falhou obter %s %s\n"
msgid "Some files failed to download"
msgstr "Falhou o download de alguns ficheiros"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de fazer apenas o download"
@@ -998,19 +998,24 @@ msgstr "Não foi encontrada a versão '%s' para '%s'"
msgid "Selected version %s (%s) for %s\n"
msgstr "Versão seleccionada %s (%s) para %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "O comando update não leva argumentos"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Impossível criar acesso exclusivo ao directório de listas"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Não é suposto nós apagarmos coisas, não pode iniciar o AutoRemover"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1018,11 +1023,11 @@ msgstr ""
"Os seguintes pacotes foram instalados automaticamente e já não são "
"necessários:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Utilize 'apt-get autoremove' para os remover."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1040,43 +1045,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "A seguinte informação pode ajudar a resolver a situação:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Erro Interno, o AutoRemover estragou coisas"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro Interno, AllUpgrade estragou algo"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "Não foi possível encontrar a tarefa %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível encontrar o pacote %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, a seleccionar %s para a expressão regular '%s'\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s está definido para ser instalado manualmente.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Você deve querer executar `apt-get -f install' para corrigir estes:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1084,7 +1089,7 @@ msgstr ""
"Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1096,119 +1101,119 @@ msgstr ""
"distribuição unstable em que alguns pacotes pedidos ainda não foram \n"
"criados ou foram movidos do Incoming."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Pacotes estragados"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Os seguintes pacotes extra serão instalados:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Pacotes sugeridos:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Pacotes recomendados:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "A calcular a actualização... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro Interno, o solucionador de problemas estragou coisas"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Não foi possível encontrar um pacote de código fonte para %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Você não possui espaço livre suficiente em %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "É necessário obter %sB de arquivos de código fonte.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter código fonte %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Falhou obter alguns arquivos."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"A saltar a descompactação do pacote de código fonte já descompactado em %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "O comando de descompactação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "O comando de compilação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "O processo filho falhou"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Deve especificar pelo menos um pacote para verificar as dependências de "
"compilação"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Não foi possível obter informações de dependências de compilação para %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de compilação.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1217,7 +1222,7 @@ msgstr ""
"a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não "
"pôde ser encontrado"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1226,32 +1231,33 @@ msgstr ""
"a dependência de %s para %s não pode ser satisfeita porque nenhuma versão "
"disponível do pacote %s pode satisfazer os requisitos de versão"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Falha ao satisfazer a dependência %s para %s: O pacote instalado %s é "
"demasiado novo"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falha ao satisfazer a dependência %s para %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Não foi possível satisfazer as dependências de compilação para %s."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Falhou processar as dependências de compilação"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Módulos Suportados:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1267,7 +1273,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1872,7 +1878,7 @@ msgstr "Ligação de socket de dados expirou"
msgid "Unable to accept connection"
msgstr "Impossível aceitar ligação"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema ao calcular o hash do ficheiro"
@@ -1956,43 +1962,43 @@ msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Não foi possível ligar a %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Não foi possível aceder à 'keyring': '%s'"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: A lista de argumentos de Acquire::gpgv::Options é demasiado longa. A sair."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erro interno: Assinatura válida, mas não foi possível determinar a impressão "
"digital da chave?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "Pelo menos uma assinatura inválida foi encontrada."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Não foi possível executar '%s' para verificar a assinatura (o gpgv está "
"instalado?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Erro desconhecido ao executar gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "As seguintes assinaturas eram inválidas:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2010,80 +2016,80 @@ msgstr "Não foi possível abrir pipe para %s"
msgid "Read error from %s process"
msgstr "Erro de leitura do processo %s"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "A aguardar por cabeçalhos"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Linha de cabeçalho errada"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor HTTP enviou um cabeçalho Content-Length inválido"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor HTTP enviou um cabeçalho Content-Range inválido"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "Este servidor HTTP possui suporte de range errado"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "A selecção falhou"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "O tempo da ligação expirou"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Erro ao escrever para o ficheiro de saída"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Erro ao escrever para ficheiro"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Erro ao escrever para o ficheiro"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro ao ler do servidor. O lado remoto fechou a ligação"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Erro ao ler do servidor"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "Falhou truncar o ficheiro"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Dados de cabeçalho errados"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "A ligação falhou"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Erro interno"
@@ -2096,11 +2102,38 @@ msgstr "Não é possível fazer mmap a um ficheiro vazio"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Não foi possível fazer mmap de %lu bytes"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "'Dynamic MMap' ficou sem espaço"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "A selecção %s não foi encontrada"
@@ -2535,7 +2568,7 @@ msgstr "O driver do método %s não pôde ser encontrado."
msgid "Method %s did not start correctly"
msgstr "Método %s não iniciou corretamente"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2913,12 +2946,16 @@ msgstr "A preparar para remover completamente %s"
msgid "Completely removed %s"
msgstr "Remoção completa de %s"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Não é possível escrever o registo (log), openpty() falhou (/dev/pts não está "
"montado?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Não foi possível aplicar o 'patch' ao ficheiro"
@@ -2927,6 +2964,9 @@ msgstr "Não foi possível aplicar o 'patch' ao ficheiro"
msgid "Connection closed prematurely"
msgstr "Ligação encerrada prematuramente"
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "'Dynamic MMap' ficou sem espaço"
+
#~ msgid ""
#~ "Since you only requested a single operation it is extremely likely that\n"
#~ "the package is simply not installable and a bug report against\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 44266dc27..c524bcd9e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2008-11-17 02:33-0200\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -159,7 +159,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s compilado em %s %s\n"
@@ -662,7 +662,7 @@ msgstr "Falhou ao renomear %s para %s"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Erro de compilação de regex - %s"
@@ -824,11 +824,11 @@ msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada."
msgid "Internal error, Ordering didn't finish"
msgstr "Erro interno, Ordenação não finalizou"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Impossível criar trava no diretório de download"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pode ser lida."
@@ -860,7 +860,7 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Depois desta operação, %sB de espaço em disco serão liberados.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Não foi possível determinar o espaço livre em %s"
@@ -897,7 +897,7 @@ msgstr "Abortar."
msgid "Do you want to continue [Y/n]? "
msgstr "Você quer continuar [S/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Falhou ao buscar %s %s\n"
@@ -906,7 +906,7 @@ msgstr "Falhou ao buscar %s %s\n"
msgid "Some files failed to download"
msgstr "Alguns arquivos falharam ao baixar"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Baixar completo e no modo somente baixar (\"download only\")"
@@ -1003,19 +1003,24 @@ msgstr "Versão '%s' para '%s' não foi encontrada"
msgid "Selected version %s (%s) for %s\n"
msgstr "Versão selecionada %s (%s) para %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "O comando update não leva argumentos"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Impossível criar trava no diretório de listas"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Nós não deveríamos apagar coisas, impossível iniciar AutoRemover"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1023,11 +1028,11 @@ msgstr ""
"Os seguintes pacotes foram automaticamente instalados e não são mais "
"requeridos:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Use 'apt-get autoremove' para removê-los."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1045,43 +1050,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "A informação a seguir pode ajudar a resolver a situação:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Erro Interno, o AutoRemover quebrou coisas"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Erro interno, AllUpgrade quebrou coisas"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "Impossível achar tarefa %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível achar pacote %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, selecionando %s para expressão regular '%s'\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s configurado para instalar manualmente.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Você deve querer executar 'apt-get -f install' para corrigí-los:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1089,7 +1094,7 @@ msgstr ""
"Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote "
"(ou especifique uma solução)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1101,117 +1106,117 @@ msgstr ""
"distribuição instável, que alguns pacotes requeridos não foram\n"
"criados ainda ou foram retirados da \"Incoming\"."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Pacotes quebrados"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Os pacotes extra a seguir serão instalados:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Pacotes sugeridos:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Pacotes recomendados:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Calculando atualização... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Falhou"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Pronto"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro interno, o solucionador de problemas quebrou coisas"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossível encontrar um pacote fonte para %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Pulando arquivo já baixado '%s'\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Você não possui espaço livre suficiente em %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Preciso obter %sB/%sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Preciso obter %sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Falhou ao buscar alguns arquivos."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando de desempacotamento '%s' falhou.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando de construção '%s' falhou.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Processo filho falhou"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Deve-se especificar pelo menos um pacote para que se cheque as dependências "
"de construção"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossível conseguir informações de dependência de construção para %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de construção.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1220,7 +1225,7 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
"pode ser encontrado"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1229,32 +1234,33 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque nenhuma versão "
"disponível do pacote %s pode satisfazer os requerimentos de versão"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito "
"novo"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falhou ao satisfazer a dependência de %s por %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Não foi possível satisfazer as dependências de compilação para %s."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Falhou ao processar as dependências de construção"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Módulos para os quais há suporte:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1270,7 +1276,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1875,7 +1881,7 @@ msgstr "Conexão do socket de dados expirou"
msgid "Unable to accept connection"
msgstr "Impossível aceitar conexão"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema criando o hash do arquivo"
@@ -1959,43 +1965,43 @@ msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Impossível conectar em %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Não foi possível acessar o chaveiro: '%s'"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Lista de argumentos de Acquire::gpgv::Options muito extensa. Saindo."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erro interno: Assinatura boa, mas não foi possível determinar a impressão "
"digital da chave?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "Ao menos uma assinatura inválida foi encontrada."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Não foi possível executar '%s' para verificar a assinatura (o gpgv está "
"instalado?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Erro desconhecido executando gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "As seguintes assinaturas eram inválidas:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2013,80 +2019,80 @@ msgstr "Não foi possível abrir \"pipe\" para %s"
msgid "Read error from %s process"
msgstr "Erro de leitura do processo %s"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Aguardando por cabeçalhos"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Linha de cabeçalho ruim"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor HTTP enviou um cabeçalho \"Content-Length\" inválido"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor HTTP enviou um cabeçalho \"Content-Range\" inválido"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "Este servidor HTTP possui suporte a \"range\" quebrado"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Seleção falhou"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Conexão expirou"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Erro escrevendo para arquivo de saída"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Erro escrevendo para arquivo"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Erro escrevendo para o arquivo"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "Falhou ao truncar arquivo"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Dados de cabeçalho ruins"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Conexão falhou"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Erro interno"
@@ -2099,11 +2105,38 @@ msgstr "Não foi possível fazer \"mmap\" de um arquivo vazio"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Não foi possível fazer \"mmap\" de %lu bytes"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "\"MMap\" Dinâmico ficou sem espaço"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Seleção %s não encontrada"
@@ -2535,7 +2568,7 @@ msgstr "O driver do método %s não pode ser encontrado."
msgid "Method %s did not start correctly"
msgstr "Método %s não iniciou corretamente"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2910,10 +2943,14 @@ msgstr "Preparando para remover completamente %s"
msgid "Completely removed %s"
msgstr "%s completamente removido"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Impossível escrever log, openpty() falhou (/dev/pts não montado?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Não foi possível aplicar o patch"
@@ -2922,6 +2959,9 @@ msgstr "Não foi possível aplicar o patch"
msgid "Connection closed prematurely"
msgstr "Conexão encerrada prematuramente"
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "\"MMap\" Dinâmico ficou sem espaço"
+
#~ msgid ""
#~ "Since you only requested a single operation it is extremely likely that\n"
#~ "the package is simply not installable and a bug report against\n"
diff --git a/po/ro.po b/po/ro.po
index a60e85ecf..ded8d6e26 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ro\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2008-11-15 02:21+0200\n"
"Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -160,7 +160,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pentru %s compilat la %s %s\n"
@@ -664,7 +664,7 @@ msgstr "Eșec la redenumirea lui %s în %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Eroare de compilare expresie regulată - %s"
@@ -825,11 +825,11 @@ msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată."
msgid "Internal error, Ordering didn't finish"
msgstr "Eroare internă, Ordering nu s-a terminat"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Nu s-a putut bloca directorul de descărcare"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Lista surselor nu poate fi citită."
@@ -859,7 +859,7 @@ msgstr "După această operație vor fi folosiți din disc încă %sB.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "N-am putut determina spațiul disponibil în %s"
@@ -897,7 +897,7 @@ msgstr "Renunțare."
msgid "Do you want to continue [Y/n]? "
msgstr "Vreți să continuați [Y/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Eșec la aducerea lui %s %s\n"
@@ -906,7 +906,7 @@ msgstr "Eșec la aducerea lui %s %s\n"
msgid "Some files failed to download"
msgstr "Descărcarea unor fișiere a eșuat"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Descărcare completă și în modul doar descărcare"
@@ -1003,30 +1003,35 @@ msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
msgid "Selected version %s (%s) for %s\n"
msgstr "Versiune selectată %s (%s) pentru %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "Comanda de actualizare nu are argumente"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Nu pot încuia directorul cu lista"
# XXX: orice sugestie este bine-venită
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Nu este voie să se șteargă lucruri, nu se poate porni AutoRemover"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Folosiți 'apt-get autoremove' pentru a le șterge."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1045,43 +1050,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "Următoarele informații ar putea să vă ajute la rezolvarea situației:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "Nu s-a putut găsi sarcina %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s este marcat ca fiind instalat manual.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Ați putea porni 'apt-get -f install' pentru a corecta acestea:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1089,7 +1094,7 @@ msgstr ""
"Dependențe neîndeplinite. Încercați 'apt-get -f install' fără nici un pachet "
"(sau oferiți o altă soluție)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1102,118 +1107,118 @@ msgstr ""
"pachete\n"
"cerute n-au fost create încă sau au fost mutate din Incoming."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Pachete deteriorate"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Următoarele extra pachete vor fi instalate:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Pachete sugerate:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Pachete recomandate:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Calculez înnoirea... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Eșec"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Terminat"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nu s-a putut găsi o sursă pachet pentru %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Sar peste fișierul deja descărcat '%s'\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nu aveți suficient spațiu în %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Este nevoie să descărcați %sB/%sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Este nevoie să descărcați %sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Aducere sursa %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Eșec la aducerea unor arhive."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Sar peste despachetarea sursei deja despachetate în %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comanda de despachetare '%s' eșuată.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comanda de construire '%s' eșuată.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Procesul copil a eșuat"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Trebuie specificat cel puțin un pachet pentru a-i verifica dependențele "
"înglobate"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nu pot prelua informațiile despre dependențele înglobate ale lui %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nu are dependențe înglobate.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1222,7 +1227,7 @@ msgstr ""
"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
"poate fi găsit"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1231,32 +1236,33 @@ msgstr ""
"Dependența lui %s de %s nu poate fi satisfăcută deoarece nici o versiune "
"disponibilă a pachetului %s nu poate satisface versiunile cerute"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este "
"prea nou"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Dependențele înglobate pentru %s nu pot fi satisfăcute."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Eșec la prelucrarea dependențelor de compilare"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Module suportate:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1272,7 +1278,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1884,7 +1890,7 @@ msgstr "Timpul de conectare la socket-ul de date expirat"
msgid "Unable to accept connection"
msgstr "Nu s-a putut accepta conexiune"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problemă la calcularea dispersiei pentru fișierul"
@@ -1969,42 +1975,42 @@ msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Nu s-a putut realiza conexiunea cu %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Nu s-a putut accesa inelul de chei: '%s'"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Lista de argumente din Acquire::gpgv::Options este prea lungă. Se iese."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Eroare internă: Semnătură corespunzătoare, dar nu s-a putut determina "
"amprenta digitale a cheii?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "Cel puțin o semnătură nevalidă a fost întâlnită."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Eroare necunoscută în timp ce se execută gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "Următoarele semnături nu au fost valide:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2022,81 +2028,81 @@ msgstr "Nu s-a putut deschide conexiunea pentru %s"
msgid "Read error from %s process"
msgstr "Eroare de citire din procesul %s"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "În așteptarea antetelor"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "S-a primit o singură linie de antet de peste %u caractere"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Linie de antet necorespunzătoare"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "Serverul HTTP a trimis un antet de răspuns necorespunzător"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Serverul HTTP a trimis un antet Content-Length necorespunzător"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Serverul HTTP a trimis un antet zonă de conținut necorespunzător"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "Acest server HTTP are un suport defect de intervale"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Format dată necunoscut"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Selecția a eșuat"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Timp de conectare expirat"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Eroare la scrierea fișierului de rezultat"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Eroare la scrierea în fișier"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Eroare la scrierea în fișierul"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Eroare la citirea de la server. Conexiunea a fost închisă de la distanță"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Eroare la citirea de la server"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "Eșec la trunchierea fișierului"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Antet de date necorespunzător"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Conectare eșuată"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Eroare internă"
@@ -2109,11 +2115,38 @@ msgstr "Nu s-a putut executa „mmap” cu un fișier gol"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nu s-a putut face mmap cu %lu octeți"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "MMap-ul dinamic a rămas fără spațiu"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Selecția %s nu a fost găsită"
@@ -2543,7 +2576,7 @@ msgstr "Metoda driver %s nu poate fi găsită."
msgid "Method %s did not start correctly"
msgstr "Metoda %s nu s-a lansat corect"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2920,11 +2953,15 @@ msgstr "Se pregătește ștergerea completă a %s"
msgid "Completely removed %s"
msgstr "Șters complet %s"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Nu se poate scrie jurnalul, openpty() a eșuat (oare /dev/pts e montat?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Nu s-a putut peteci fișierul"
@@ -2933,6 +2970,9 @@ msgstr "Nu s-a putut peteci fișierul"
msgid "Connection closed prematurely"
msgstr "Conexiune închisă prematur"
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "MMap-ul dinamic a rămas fără spațiu"
+
#~ msgid ""
#~ "Since you only requested a single operation it is extremely likely that\n"
#~ "the package is simply not installable and a bug report against\n"
diff --git a/po/ru.po b/po/ru.po
index f14cc5b62..17b69b217 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,13 +8,14 @@
# Dmitry Astapov <adept@umc.com.ua>, 2004.
# Dmitry Astapov <adept@despammed.com>, 2004.
# Yuri Kozlov <kozlov.y@gmail.com>, 2004, 2005, 2006, 2007, 2008.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: apt 0.7.19\n"
+"Project-Id-Version: apt 0.7.21\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-16 21:10+0300\n"
-"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
+"PO-Revision-Date: 2009-05-03 22:01+0400\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -94,7 +95,7 @@ msgstr "Всего информации о зависимостях: "
#: cmdline/apt-cache.cc:335
msgid "Total slack space: "
-msgstr "Пустого места в кеше: "
+msgstr "Пустого места в кэше: "
#: cmdline/apt-cache.cc:343
msgid "Total space accounted for: "
@@ -119,7 +120,7 @@ msgstr "Списки пакетов:"
#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Кеш рассинхронизирован, невозможно обнаружить ссылку на список пакетов"
+msgstr "Кэш рассинхронизирован, невозможно обнаружить ссылку на список пакетов"
#: cmdline/apt-cache.cc:1532
#, c-format
@@ -214,10 +215,10 @@ msgstr ""
" или: apt-cache [параметры] showsrc пакет1 [пакет2 ...]\n"
"\n"
"apt-cache -- низкоуровневый инструмент, используемый для управления\n"
-"двоичными кеш-файлами APT и поиску по ним\n"
+"двоичными кэш-файлами APT и поиску по ним\n"
"Команды:\n"
-" add - добавить файл пакета в кеш исходников\n"
-" gencaches - построить оба кеша пакетов - двоичных и с исходным кодом\n"
+" add - добавить файл пакета в кэш источников\n"
+" gencaches - построить кэш пакетов и кэш источников\n"
" showpkg - показать общую информацию о конкретном пакете\n"
" stats - показать общую статистику\n"
" dump - показать весь файл в сокращённой форме\n"
@@ -234,13 +235,12 @@ msgstr ""
"\n"
"Параметры:\n"
" -h Этот текст.\n"
-" -p=? Кеш пакетов.\n"
-" -s=? Кеш пакетов исходного кода.\n"
+" -p=? Кэш пакетов.\n"
+" -s=? Кэш источников.\n"
" -q Не показывать индикатор прогресса.\n"
" -i Показывать только важные зависимости для команды unmet.\n"
" -c=? Читать указанный файл настройки.\n"
-" -o=? Задать произвольный параметра настройки, например, -o dir::cache=/"
-"tmp\n"
+" -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
"Подробности в справочных страницах apt-cache(8) и apt.conf(5).\n"
#: cmdline/apt-cdrom.cc:78
@@ -274,18 +274,19 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Использование: apt-config [options] command\n"
+"Использование: apt-config [параметры] команда\n"
"\n"
-"apt-config - простой инструмент для чтения конфигурационного файла APT\n"
+"apt-config -- простой инструмент для чтения файла настройки APT\n"
"\n"
"Команды:\n"
" shell - режим shell\n"
-" dump - показать конфигурацию\n"
+" dump - показать настройки\n"
"\n"
-"Опции:\n"
+"Параметры:\n"
" -h Этот текст.\n"
-" -с=? Читать указанный конфигурационный файл.\n"
-" -o=? Установить произвольную опцию, к примеру, -o dir::cache=/tmp\n"
+" -с=? Читать указанный файл настройки.\n"
+" -o=? Задать значение произвольной настройке, например, -o dir::cache=/"
+"tmp\n"
#: cmdline/apt-extracttemplates.cc:98
#, c-format
@@ -305,16 +306,15 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Использование: apt-extracttemplates file1 [file2 ...]\n"
+"Использование: apt-extracttemplates файл1 [файл2 ...]\n"
"\n"
-"apt-extracttemplates извлекает из пакетов Debian конфигурационные скрипты\n"
-"и файлы-шаблоны\n"
+"apt-extracttemplates извлекает из пакетов Debian данные config и template\n"
"\n"
-"Опции:\n"
+"Параметры:\n"
" -h Этот текст\n"
-" -t Установить каталог для временных файлов\n"
-" -c=? Читать указанный конфигурационный файл\n"
-" -o=? Указать произвольную опцию, к примеру, -o dir::cache=/tmp\n"
+" -t Задать каталог для временных файлов\n"
+" -c=? Читать указанный файл настройки\n"
+" -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827
#, c-format
@@ -338,9 +338,7 @@ msgstr "Ошибка обработки каталога %s"
#: ftparchive/apt-ftparchive.cc:251
msgid "Source extension list is too long"
-msgstr ""
-"Список расширений, допустимых для пакетов с исходными текстами, слишком "
-"длинен"
+msgstr "Список расширений источников слишком длинен"
#: ftparchive/apt-ftparchive.cc:368
msgid "Error writing header to contents file"
@@ -429,15 +427,14 @@ msgstr ""
"Параметры:\n"
" -h Этот текст\n"
" --md5 Управление генерацией MD5-хешей\n"
-" -s=? Указать файл переназначений (override) для пакетов с исходными "
-"текстами\n"
+" -s=? Указать файл переназначений (override) для источников\n"
" -q Не выводить сообщения в процессе работы\n"
-" -d=? Указать кеширующую базу данных (не обязательно)\n"
+" -d=? Указать кэширующую базу данных (не обязательно)\n"
" --no-delink Включить режим отладки процесса удаления файлов\n"
" --contents Управление генерацией полного перечня содержимого пакетов\n"
" (файла Contents)\n"
-" -c=? Использовать указанный конфигурационный файл\n"
-" -o=? Указать произвольный параметр конфигурации"
+" -c=? Использовать указанный файл настройки\n"
+" -o=? Задать значение произвольному параметру настройки"
#: ftparchive/apt-ftparchive.cc:759
msgid "No selections matched"
@@ -820,7 +817,7 @@ msgstr "Некоторые пакеты невозможно аутентифи
#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
msgid "There are problems and -y was used without --force-yes"
-msgstr "Существуют проблемы, а опция -y использована без --force-yes"
+msgstr "Существуют проблемы, а параметр -y указан без --force-yes"
#: cmdline/apt-get.cc:773
msgid "Internal error, InstallPackages was called with broken packages!"
@@ -838,7 +835,7 @@ msgstr "Внутренняя ошибка, Ordering не завершилась"
#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
msgid "Unable to lock the download directory"
-msgstr "Невозможно заблокировать каталог для загрузки"
+msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы"
#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
#: apt-pkg/cachefile.cc:65
@@ -915,23 +912,23 @@ msgstr "Хотите продолжить [Д/н]? "
#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
-msgstr "Не удалось загрузить %s %s\n"
+msgstr "Не удалось получить %s %s\n"
#: cmdline/apt-get.cc:1002
msgid "Some files failed to download"
-msgstr "Некоторые файлы не удалось загрузить"
+msgstr "Некоторые файлы скачать не удалось"
#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
msgid "Download complete and in download only mode"
-msgstr "Указан режим \"только загрузка\", и загрузка завершена"
+msgstr "Указан режим \"только скачивание\", и скачивание завершено"
#: cmdline/apt-get.cc:1009
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-"Невозможно загрузить некоторые архивы, вероятно надо запустить apt-get "
-"update или попытаться повторить запуск с ключом --fix-missing"
+"Невозможно получить некоторые архивы, вероятно надо запустить apt-get update "
+"или попытаться повторить запуск с ключом --fix-missing"
#: cmdline/apt-get.cc:1013
msgid "--fix-missing and media swapping is not currently supported"
@@ -953,8 +950,7 @@ msgstr "Заметьте, вместо %2$s выбирается %1$s\n"
#: cmdline/apt-get.cc:1063
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Пропускается %s - пакет уже установлен, и опция upgrade не установлена.\n"
+msgstr "Пропускается %s - пакет уже установлен и нет команды upgrade.\n"
#: cmdline/apt-get.cc:1081
#, c-format
@@ -997,7 +993,7 @@ msgstr "Для пакета %s не найдены кандидаты на ус
#: cmdline/apt-get.cc:1156
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Переустановка %s невозможна, он не загружается.\n"
+msgstr "Переустановка %s невозможна, он не скачивается.\n"
#: cmdline/apt-get.cc:1164
#, c-format
@@ -1151,18 +1147,17 @@ msgstr "Внутренняя ошибка, решатель проблем вс
#: cmdline/apt-get.cc:2068
msgid "Must specify at least one package to fetch source for"
msgstr ""
-"Укажите как минимум один пакет, для которого необходимо загрузить исходные "
-"тексты"
+"Укажите как минимум один пакет, исходный код которого необходимо получить"
#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
#, c-format
msgid "Unable to find a source package for %s"
-msgstr "Невозможно найти пакет с исходными текстами для %s"
+msgstr "Невозможно найти пакет с исходным кодом для %s"
#: cmdline/apt-get.cc:2147
#, c-format
msgid "Skipping already downloaded file '%s'\n"
-msgstr "Пропускаем уже загруженный файл '%s'\n"
+msgstr "Пропускаем уже скачанный файл '%s'\n"
#: cmdline/apt-get.cc:2175
#, c-format
@@ -1172,28 +1167,26 @@ msgstr "Недостаточно места в %s"
#: cmdline/apt-get.cc:2181
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n"
+msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n"
#: cmdline/apt-get.cc:2184
#, c-format
msgid "Need to get %sB of source archives.\n"
-msgstr "Нужно загрузить %sB архивов с исходными текстами.\n"
+msgstr "Необходимо получить %sб архивов исходного кода.\n"
#: cmdline/apt-get.cc:2190
#, c-format
msgid "Fetch source %s\n"
-msgstr "Загрузка исходных текстов %s\n"
+msgstr "Получение исходного кода %s\n"
#: cmdline/apt-get.cc:2221
msgid "Failed to fetch some archives."
-msgstr "Некоторые архивы не удалось загрузить."
+msgstr "Некоторые архивы не удалось получить."
#: cmdline/apt-get.cc:2249
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-"Распаковка исходных текстов пропущена, так как в %s уже находятся "
-"распакованные исходные тексты\n"
+msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n"
#: cmdline/apt-get.cc:2261
#, c-format
@@ -1274,6 +1267,48 @@ msgid "Supported modules:"
msgstr "Поддерживаемые модули:"
#: cmdline/apt-get.cc:2619
+#, fuzzy
+#| msgid ""
+#| "Usage: apt-get [options] command\n"
+#| " apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+#| " apt-get [options] source pkg1 [pkg2 ...]\n"
+#| "\n"
+#| "apt-get is a simple command line interface for downloading and\n"
+#| "installing packages. The most frequently used commands are update\n"
+#| "and install.\n"
+#| "\n"
+#| "Commands:\n"
+#| " update - Retrieve new lists of packages\n"
+#| " upgrade - Perform an upgrade\n"
+#| " install - Install new packages (pkg is libc6 not libc6.deb)\n"
+#| " remove - Remove packages\n"
+#| " autoremove - Remove automatically all unused packages\n"
+#| " purge - Remove packages and config files\n"
+#| " source - Download source archives\n"
+#| " build-dep - Configure build-dependencies for source packages\n"
+#| " dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+#| " dselect-upgrade - Follow dselect selections\n"
+#| " clean - Erase downloaded archive files\n"
+#| " autoclean - Erase old downloaded archive files\n"
+#| " check - Verify that there are no broken dependencies\n"
+#| "\n"
+#| "Options:\n"
+#| " -h This help text.\n"
+#| " -q Loggable output - no progress indicator\n"
+#| " -qq No output except for errors\n"
+#| " -d Download only - do NOT install or unpack archives\n"
+#| " -s No-act. Perform ordering simulation\n"
+#| " -y Assume Yes to all queries and do not prompt\n"
+#| " -f Attempt to correct a system with broken dependencies in place\n"
+#| " -m Attempt to continue if archives are unlocatable\n"
+#| " -u Show a list of upgraded packages as well\n"
+#| " -b Build the source package after fetching it\n"
+#| " -V Show verbose version numbers\n"
+#| " -c=? Read this configuration file\n"
+#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#| "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+#| "pages for more information and options.\n"
+#| " This APT has Super Cow Powers.\n"
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1320,49 +1355,50 @@ msgstr ""
" apt-get [параметры] install|remove pkg1 [pkg2 ...]\n"
" apt-get [параметры] source pkg1 [pkg2 ...]\n"
"\n"
-"apt-get -- простой интерфейс командной строки для загрузки и\n"
-"установки пакетов. Наиболее часто используемые команды -- update \n"
-"и install.\n"
+"apt-get -- простая программа с интерфейсом командной строки\n"
+"для скачивания и установки пакетов. Наиболее часто используемые\n"
+"команды -- update и install.\n"
"\n"
"Команды:\n"
-" update - получить новые списки пакетов\n"
+" update - получить новые списки пакетов\n"
" upgrade - выполнить обновление\n"
-" install - установить новые пакеты (имя пакета указывается\n"
-" как libc6, а не libc6.deb)\n"
-" remove - удалить пакеты\n"
+" install - установить новые пакеты (на месте pkg указывается имя пакета\n"
+" (libc6), а не имя файла (libc6.deb))\n"
+" remove - удалить пакеты\n"
" autoremove - автоматически удалить все неиспользуемые пакеты\n"
-" purge - удалить и вычистить пакеты\n"
-" source - загрузить архивы с исходными текстами\n"
-" build-dep - загрузить всё необходимое для сборки указанного\n"
-" пакета из исходных текстов\n"
+" purge - удалить пакеты вместе с их файлами настройки\n"
+" source - скачать архивы с исходным кодом\n"
+" build-dep - настроить всё необходимое для сборки\n"
+" пакета с исходным кодом\n"
" dist-upgrade - обновить всю систему, подробнее в apt-get(8)\n"
-" dselect-upgrade - руководствоваться выбором, сделанным в dselect'е\n"
-" clean - удалить загруженные файлы архивов\n"
-" autoclean - удалить старые загруженные файлы архивов\n"
-" check - проверить наличие нарушенных зависимостей\n"
+" dselect-upgrade - руководствоваться выбором, сделанным в dselect\n"
+" clean - удалить скачанные файлы архивов\n"
+" autoclean - удалить старые скачанные файлы архивов\n"
+" check - проверить наличие нарушенных зависимостей\n"
"\n"
"Параметры:\n"
-" -h этот текст\n"
-" -q выводить сообщения, пригодные для записи в файл журнала,\n"
-" не выводить индикатор хода работы\n"
-" -qq выводить только сообщения об ошибках\n"
-" -d только загрузить - НЕ устанавливать и не распаковывать архивы\n"
-" -s не выполнять действия на самом деле, только имитация работы\n"
-" -y отвечать \"Да\" на все вопросы, cами вопросы при этом не выводятся\n"
-" -f продолжать, даже если проверка целостности не прошла\n"
-" -m продолжать, даже если местоположение архивов неизвестно\n"
-" -u показывать также список обновляемых пакетов\n"
-" -b собрать пакет из исходных текстов после получения\n"
-" -V показать полные номера версий\n"
+" -h этот текст\n"
+" -q выводить сообщения, пригодные для записи в файл журнала,\n"
+" не выводить индикатор хода работы\n"
+" -qq выводить только сообщения об ошибках\n"
+" -d только скачать - НЕ устанавливать и не распаковывать архивы\n"
+" -s не выполнять действия на самом деле, только имитация работы\n"
+" -y отвечать \"Да\" на все вопросы, сами вопросы при этом не выводить\n"
+" -f попытаться исправить систему, имеющую сломанные зависимости\n"
+" -m продолжать, даже если местоположение архивов неизвестно\n"
+" -u показывать также список обновляемых пакетов\n"
+" -b собрать пакет из исходного кода после его получения\n"
+" -V показать полные номера версий\n"
" -c=? читать указанный файл настройки\n"
-" -o=? задать произвольный параметр настройки, например, -o dir::cache=/tmp\n"
-"Страницы руководства apt-get(8), sources.list(5) и apt.conf(5)\n"
+" -o=? задать значение произвольному параметру настройки, например, -o dir::"
+"cache=/tmp\n"
+"Справочные страницы apt-get(8), sources.list(5) и apt.conf(5)\n"
"содержат подробную информацию и описание параметров.\n"
" В APT есть коровья СУПЕРСИЛА.\n"
#: cmdline/acqprogress.cc:55
msgid "Hit "
-msgstr "В кеше "
+msgstr "В кэше "
#: cmdline/acqprogress.cc:79
msgid "Get:"
@@ -1414,16 +1450,17 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Использование: apt-sortpkgs [параметры] file1 [file2 ...]\n"
+"Использование: apt-sortpkgs [параметры] файл1 [файл2 ...]\n"
"\n"
-"apt-sortpkgs - простой инструмент для сортировки списков пакетов. Опция -s\n"
-"используется, чтобы указать тип списка.\n"
+"apt-sortpkgs - простой инструмент для сортировки списков пакетов. Параметр -"
+"s\n"
+"используется для указания типа списка.\n"
"\n"
"Параметры:\n"
" -h этот текст\n"
-" -s сортировать список файлов с исходными текстами\n"
-" -c=? читать указанный файл конфигурации\n"
-" -o=? установить произвольную опцию, например, -o dir::cache=/tmp\n"
+" -s сортировать список файлов пакетов исходного кода\n"
+" -c=? читать указанный файл настройки\n"
+" -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
#: dselect/install:32
msgid "Bad default setting!"
@@ -1532,7 +1569,7 @@ msgstr "Двойное добавление diversion %s -> %s"
#: apt-inst/filelist.cc:549
#, c-format
msgid "Duplicate conf file %s/%s"
-msgstr "Повторно указанный конфигурационный файл %s/%s"
+msgstr "Повторно указан файл настройки %s/%s"
#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
#, c-format
@@ -1684,7 +1721,7 @@ msgstr "Внутренняя ошибка при добавлении diversion"
#: apt-inst/deb/dpkgdb.cc:379
msgid "The pkg cache must be initialized first"
-msgstr "В первую очередь должен быть проинициализирован кеш пакетов"
+msgstr "В первую очередь должен быть проинициализирован кэш пакетов"
#: apt-inst/deb/dpkgdb.cc:439
#, c-format
@@ -1903,7 +1940,7 @@ msgstr "Проблема при хешировании файла"
#: methods/ftp.cc:877
#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr "Невозможно загрузить файл, сервер сообщил: '%s'"
+msgstr "Невозможно получить файл, сервер сообщил: '%s'"
#: methods/ftp.cc:892 methods/rsh.cc:322
msgid "Data socket timed out"
@@ -2061,7 +2098,7 @@ msgstr "Http-сервер послал неверный заголовок Conte
#: methods/http.cc:603
msgid "This HTTP server has broken range support"
-msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов"
+msgstr "Этот HTTP-сервер не поддерживает скачивание фрагментов файлов"
#: methods/http.cc:627
msgid "Unknown date format"
@@ -2120,9 +2157,14 @@ msgstr "Невозможно отобразить в память пустой
msgid "Couldn't make mmap of %lu bytes"
msgstr "Невозможно отобразить в память %lu байт"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Выход за границы диапазона при работе MMap"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Limit. "
+"Текущее значение: %lu. (man 5 apt.conf)"
#: apt-pkg/contrib/strutl.cc:1014
#, c-format
@@ -2137,7 +2179,7 @@ msgstr "Неизвестная аббревиатура типа: '%c'"
#: apt-pkg/contrib/configuration.cc:497
#, c-format
msgid "Opening configuration file %s"
-msgstr "Открытие файла конфигурации %s"
+msgstr "Открытие файла настройки %s"
#: apt-pkg/contrib/configuration.cc:662
#, c-format
@@ -2194,38 +2236,38 @@ msgstr "%c%s... Готово"
#: apt-pkg/contrib/cmndline.cc:77
#, c-format
msgid "Command line option '%c' [from %s] is not known."
-msgstr "Неизвестная опция командной строки '%c' [из %s]."
+msgstr "Неизвестный параметр командной строки '%c' [из %s]."
#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
#: apt-pkg/contrib/cmndline.cc:119
#, c-format
msgid "Command line option %s is not understood"
-msgstr "Не распознанная опция командной строки %s"
+msgstr "Не распознанный параметр командной строки %s"
#: apt-pkg/contrib/cmndline.cc:124
#, c-format
msgid "Command line option %s is not boolean"
-msgstr "Опция командной строки %s - не логический переключатель \"да/нет\""
+msgstr "Параметр командной строки %s - не логический переключатель \"да/нет\""
#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
#, c-format
msgid "Option %s requires an argument."
-msgstr "Опция %s требует аргумента."
+msgstr "Для параметра %s требуется аргумент."
#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Опция %s: значение должно иметь вид =<val>."
+msgstr "Значение параметра %s должно иметь вид =<val>."
#: apt-pkg/contrib/cmndline.cc:234
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Опция %s требует аргумент в виде целого числа, а не '%s'"
+msgstr "Для параметра %s требуется аргумент в виде целого числа, а не '%s'"
#: apt-pkg/contrib/cmndline.cc:265
#, c-format
msgid "Option '%s' is too long"
-msgstr "Слишком длинная опция '%s'"
+msgstr "Параметр '%s' слишком длинный"
#: apt-pkg/contrib/cmndline.cc:298
#, c-format
@@ -2327,15 +2369,15 @@ msgstr "Проблема при синхронизации файловых бу
#: apt-pkg/pkgcache.cc:132
msgid "Empty package cache"
-msgstr "Кеш пакетов пуст"
+msgstr "Кэш пакетов пуст"
#: apt-pkg/pkgcache.cc:138
msgid "The package cache file is corrupted"
-msgstr "Кеш пакетов повреждён"
+msgstr "Кэш пакетов повреждён"
#: apt-pkg/pkgcache.cc:143
msgid "The package cache file is an incompatible version"
-msgstr "Не поддерживаемая версия кеша пакетов"
+msgstr "Не поддерживаемая версия кэша пакетов"
#: apt-pkg/pkgcache.cc:148
#, c-format
@@ -2344,7 +2386,7 @@ msgstr "Данный APT не поддерживает систему верси
#: apt-pkg/pkgcache.cc:153
msgid "The package cache was built for a different architecture"
-msgstr "Кеш пакетов был собран для другой архитектуры"
+msgstr "Кэш пакетов был собран для другой архитектуры"
#: apt-pkg/pkgcache.cc:224
msgid "Depends"
@@ -2495,7 +2537,8 @@ msgstr ""
"Вследствие возникновения циклических зависимостей типа Конфликтует/"
"ПредЗависит, для продолжения установки необходимо временно удалить "
"существенно важный пакет %s. Это может привести к фатальным последствиям. "
-"Если вы действительно хотите продолжить, включите опцию APT::Force-LoopBreak."
+"Если вы действительно хотите продолжить, установите параметр APT::Force-"
+"LoopBreak."
#: apt-pkg/pkgrecords.cc:32
#, c-format
@@ -2526,8 +2569,8 @@ msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-"Некоторые индексные файлы не загрузились, они были проигнорированы или "
-"вместо них были использованы старые версии"
+"Некоторые индексные файлы не скачались, они были проигнорированы или вместо "
+"них были использованы старые версии"
#: apt-pkg/acquire.cc:59
#, c-format
@@ -2544,12 +2587,12 @@ msgstr "Архивный каталог %spartial отсутствует."
#: apt-pkg/acquire.cc:828
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Загружается файл %li из %li (%s осталось)"
+msgstr "Скачивается файл %li из %li (осталось %s)"
#: apt-pkg/acquire.cc:830
#, c-format
msgid "Retrieving file %li of %li"
-msgstr "Загружается файл %li из %li"
+msgstr "Скачивается файл %li из %li"
#: apt-pkg/acquire-worker.cc:110
#, c-format
@@ -2607,7 +2650,7 @@ msgstr "Для фиксации не указан приоритет (или у
#: apt-pkg/pkgcachegen.cc:72
msgid "Cache has an incompatible versioning system"
-msgstr "Кеш имеет несовместимую систему версий"
+msgstr "Кэш имеет несовместимую систему версий"
#: apt-pkg/pkgcachegen.cc:115
#, c-format
@@ -2689,7 +2732,7 @@ msgstr "Во время обработки файла зависимостей
#: apt-pkg/pkgcachegen.cc:690
#, c-format
msgid "Couldn't stat source package list %s"
-msgstr "Не удалось получить атрибуты списка пакетов с исходными текстами %s"
+msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s"
#: apt-pkg/pkgcachegen.cc:775
msgid "Collecting File Provides"
@@ -2697,7 +2740,7 @@ msgstr "Сбор информации о Provides"
#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909
msgid "IO Error saving source cache"
-msgstr "Ошибка ввода/вывода при попытке сохранить кеш исходных текстов"
+msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников"
#: apt-pkg/acquire-item.cc:127
#, c-format
@@ -2799,8 +2842,8 @@ msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
"zu signatures\n"
msgstr ""
-"Найдено индексов: %zu для пакетов, %zu для пакетов c исходными текстами, %zu "
-"для переводов и %zu для сигнатур\n"
+"Найдено индексов: %zu для пакетов, %zu для источников, %zu для переводов и %"
+"zu для сигнатур\n"
#: apt-pkg/cdrom.cc:715
#, c-format
@@ -2892,7 +2935,7 @@ msgstr "Распаковывается %s"
#: apt-pkg/deb/dpkgpm.cc:611
#, c-format
msgid "Preparing to configure %s"
-msgstr "Подготавливается для конфигурации %s"
+msgstr "Подготавливается для настройки %s"
#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615
#, c-format
@@ -2938,3 +2981,21 @@ msgstr "Не удалось пропатчить файл"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Соединение закрыто преждевременно"
+
+#~ msgid "No source package '%s' picking '%s' instead\n"
+#~ msgstr "Нет пакета с исходным кодом '%s', вместо него берётся '%s'\n"
+
+#~ msgid "%lid %lih %limin %lis"
+#~ msgstr "%liд %liч %liмин %liс"
+
+#~ msgid "%lih %limin %lis"
+#~ msgstr "%liч %liмин %liс"
+
+#~ msgid "%limin %lis"
+#~ msgstr "%liмин %liс"
+
+#~ msgid "%lis"
+#~ msgstr "%liс"
+
+#~ msgid "Not locked"
+#~ msgstr "Не заблокирован"
diff --git a/po/sk.po b/po/sk.po
index cfc3ab9b4..5e05ebc33 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,14 +4,14 @@
# thanks to Miroslav Kure <kurem@debian.cz>
#
# Peter Mann <Peter.Mann@tuke.sk>, 2006.
-# Ivan Masár <helix84@centrum.sk>, 2008.
+# Ivan Masár <helix84@centrum.sk>, 2008, 2009.
#
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-12 23:06+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
+"PO-Revision-Date: 2009-04-27 16:43+0100\n"
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
"MIME-Version: 1.0\n"
@@ -160,7 +160,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pre %s skompilovaný %s %s\n"
@@ -307,7 +307,7 @@ msgstr ""
"a šablón z balíkov Debian\n"
"\n"
"Voľby:\n"
-" -h Tento pomocnék.\n"
+" -h Tento pomocník.\n"
" -t Nastaví dočasný adresár\n"
" -c=? Načíta tento konfiguračný súbor\n"
" -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
@@ -496,7 +496,7 @@ msgstr "E: Chyby sa týkajú súboru "
#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
#, c-format
msgid "Failed to resolve %s"
-msgstr "Chyba pri prklade %s"
+msgstr "Chyba pri preklade %s"
#: ftparchive/writer.cc:170
msgid "Tree walking failed"
@@ -602,7 +602,7 @@ msgstr "Komprimovaný výstup %s potrebuje kompresnú sadu"
#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
msgid "Failed to create IPC pipe to subprocess"
-msgstr "Zlyhalo vytvorenie medziprocesovej rúry k podprocesu"
+msgstr "Zlyhalo vytvorenie IPC rúry k podprocesu"
#: ftparchive/multicompress.cc:195
msgid "Failed to create FILE*"
@@ -655,7 +655,7 @@ msgstr "Premenovanie %s na %s zlyhalo"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba pri preklade regulárneho výrazu - %s"
@@ -816,11 +816,11 @@ msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
msgid "Internal error, Ordering didn't finish"
msgstr "Vnútorná chyba, Triedenie sa neukončilo"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Adresár pre sťahovanie sa nedá zamknúť"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Nedá sa načítať zoznam zdrojov."
@@ -851,7 +851,7 @@ msgstr "Po tejto operácii sa na disku použije ďalších %sB.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po tejto operácii sa na disku uvoľní %sB.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
@@ -888,7 +888,7 @@ msgstr "Prerušené."
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokračovať [Y/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Zlyhalo stiahnutie %s %s\n"
@@ -897,7 +897,7 @@ msgstr "Zlyhalo stiahnutie %s %s\n"
msgid "Some files failed to download"
msgstr "Niektoré súbory sa nedajú stiahnuť"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Sťahovanie ukončené v režime „iba stiahnuť“"
@@ -993,30 +993,35 @@ msgstr "Nebola nájdená verzia „%s“ pre „%s“"
msgid "Selected version %s (%s) for %s\n"
msgstr "Zvolená verzia %s (%s) pre %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr "Zdrojový balík „%s“ neexistuje, namiesto neho sa použije „%s“\n"
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "Príkaz update neprijíma žiadne argumenty"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Adresár zoznamov sa nedá zamknúť"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Nemajú sa odstraňovať veci, nespustí sa AutoRemover"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Na ich odstránenie použite „apt-get autoremove“."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1034,43 +1039,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Vnútorná chyba, AutoRemover niečo pokazil"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "Nebolo možné nájsť úlohu %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Balík %s sa nedá nájsť"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Poznámka: vyberá sa %s pre regulárny výraz „%s“\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s je nastavený na manuálnu inštaláciu.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Na opravu nasledovných môžete spustiť „apt-get -f install“:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1078,7 +1083,7 @@ msgstr ""
"Nesplnené závislosti. Skúste spustiť „apt-get -f install“ bez balíkov (alebo "
"navrhnite riešenie)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1090,157 +1095,157 @@ msgstr ""
"požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n"
"Novoprichádzajúcich (Incoming) balíkov."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Poškodené balíky"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Nainštalujú sa nasledovné extra balíky:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Odporúčané balíky:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Prepočítava sa aktualizácia... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Chyba"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nedá sa nájsť zdrojový balík pre %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Preskakuje sa už stiahnutý súbor „%s“\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Na %s nemáte dostatok voľného miesta"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Je potrebné stiahnuť %sB zdrojových archívov.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Stiahnuť zdroj %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Zlyhalo stiahnutie niektorých archívov."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Príkaz na zostavenie „%s“ zlyhal.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Proces potomka zlyhal"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na "
"zostavenie"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nedajú sa získať závislosti na zostavenie %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žiadne závislosti na zostavenie.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s závislosť pre %s sa nemôže splniť, pretože sa nedá nájsť balík %s"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-"%s závislosť pre %s sa nedá splniť, protože sa nedá nájsť verzia balíka %s, "
+"%s závislosť pre %s sa nedá splniť, pretože sa nedá nájsť verzia balíka %s, "
"ktorá zodpovedá požiadavke na verziu"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti na zostavenie %s sa nedajú splniť."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Spracovanie závislostí na zostavenie zlyhalo"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1256,7 +1261,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1297,7 +1302,7 @@ msgstr ""
"deb)\n"
" remove - Odstráni balíky\n"
" autoremove - Automaticky odstráni všetky nepoužité balíky\n"
-" purge - Odstráni a vyčistí balíky\n"
+" purge - Odstráni a balíky a ich konfiguračné súbory\n"
" source - Stiahne zdrojové archívy\n"
" build-dep - Nastaví závislosti kompilácie pre zdrojové balíky\n"
" dist-upgrade - Aktualizácia distribúcie, viď apt-get(8)\n"
@@ -1443,7 +1448,7 @@ msgstr "Kontrolný súčet pre tar zlyhal, archív je poškodený"
#: apt-inst/contrib/extracttar.cc:296
#, c-format
msgid "Unknown TAR header type %u, member %s"
-msgstr "Neznáma hlavička TARu typ %u, člen %s"
+msgstr "Neznáma TAR hlavička typu %u, člen %s"
#: apt-inst/contrib/arfile.cc:70
msgid "Invalid archive signature"
@@ -1471,7 +1476,7 @@ msgstr "Pokus o uvoľnenie uzla (DropNode) na stále prepojenom uzle"
#: apt-inst/filelist.cc:412
msgid "Failed to locate the hash element!"
-msgstr "Hashovací prvok sa nedá nájsť!"
+msgstr "Hašovací prvok sa nedá nájsť!"
#: apt-inst/filelist.cc:459
msgid "Failed to allocate diversion"
@@ -1537,7 +1542,7 @@ msgstr "Adresár %s sa nahradí neadresárom"
#: apt-inst/extract.cc:280
msgid "Failed to locate node in its hash bucket"
-msgstr "Nedá sa nájsť uzol v jeho hashovacej oblasti"
+msgstr "Nedá sa nájsť uzol na adrese jeho hašu"
#: apt-inst/extract.cc:284
msgid "The path is too long"
@@ -1693,14 +1698,14 @@ msgstr "Nespracovateľný riadiaci súbor"
#: methods/cdrom.cc:114
#, c-format
msgid "Unable to read the cdrom database %s"
-msgstr "Nedá sa čítať databáza na cdrom %s"
+msgstr "Nedá sa čítať databáza na CD-ROM %s"
#: methods/cdrom.cc:123
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
msgstr ""
-"Pre pridanie CD do APT použijte apt-cdrom. apt-get update sa nedá využiť na "
+"Pre pridanie CD do APT použije apt-cdrom. apt-get update sa nedá využiť na "
"pridávanie nových CD."
#: methods/cdrom.cc:131
@@ -1853,7 +1858,7 @@ msgstr "Uplynulo spojenie dátového socketu"
msgid "Unable to accept connection"
msgstr "Spojenie sa nedá prijať"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hašovaním súboru"
@@ -1937,40 +1942,40 @@ msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Nedá sa pripojiť k %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Zväzok kľúčov „%s“ je nedostupný."
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"CHYBA: zoznam argumentov z Acquire::gpgv::Options je príliš dlhý. Ukončuje "
"sa."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Vnútorná chyba: Správna signatúra, ale sa nedá zistiť odtlačok kľúča?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "Bola zistená aspoň jedna nesprávna signatúra."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "Nedá sa spustiť „%s“ na kontrolu signatúry (je nainštalované gpgv?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Neznáma chyba pri spustení gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "Nasledovné signatúry sú neplatné:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1988,80 +1993,80 @@ msgstr "Nedá sa otvoriť rúra pre %s"
msgid "Read error from %s process"
msgstr "Chyba pri čítaní z procesu %s"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Čaká sa na hlavičky"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Získal sa jeden riadok hlavičky cez %u znakov"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Chybná hlavička"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP server poslal neplatnú hlavičku odpovede"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP server poslal neplatnú hlavičku Content-Length"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP server poslal neplatnú hlavičku Content-Range"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má poškodenú podporu rozsahov"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Neznámy formát dátumu"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Výber zlyhal"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Uplynul čas spojenia"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupného súboru"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Chyba zápisu do tohto súboru"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Chyba pri čítaní zo servera"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "Nepodarilo sa skrátiť súbor"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Zlé dátové záhlavie"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Spojenie zlyhalo"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Vnútorná chyba"
@@ -2074,11 +2079,40 @@ msgstr "Nedá sa vykonať mmap prázdneho súboru"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nedá sa urobiť mmap %lu bajtov"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Dynamickému MMap došlo miesto"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-"
+"Limit. Aktuálna hodnota: %lu. (man 5 apt.conf)"
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%li d %li h %li min %li s"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li h %li min %li s"
-#: apt-pkg/contrib/strutl.cc:1014
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr "%li min %li s"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr "%li s"
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Voľba %s nenájdená"
@@ -2203,7 +2237,7 @@ msgstr "Nedá sa prejsť do %s"
#: apt-pkg/contrib/cdromutl.cc:188
msgid "Failed to stat the cdrom"
-msgstr "Nedá sa vyhodnotiť cdrom"
+msgstr "Nedá sa vykonať stat() CD-ROM"
#: apt-pkg/contrib/fileutl.cc:149
#, c-format
@@ -2218,7 +2252,7 @@ msgstr "Súbor zámku %s sa nedá otvoriť"
#: apt-pkg/contrib/fileutl.cc:172
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Zamykanie pre súbor zámku %s pripojený cez nfs sa nepoužíva"
+msgstr "Zamykanie pre súbor zámku %s pripojený cez NFS sa nepoužíva"
#: apt-pkg/contrib/fileutl.cc:176
#, c-format
@@ -2505,7 +2539,7 @@ msgstr "Nedá sa nájsť ovládač spôsobu %s."
msgid "Method %s did not start correctly"
msgstr "Spôsob %s nebol správne spustený"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Vložte disk nazvaný „%s“ do mechaniky „%s“ a stlačte Enter."
@@ -2868,12 +2902,16 @@ msgstr "Pripravuje sa úplné odstránenie %s"
msgid "Completely removed %s"
msgstr "Balík „%s“ je úplne odstránený"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Nedá sa zapísať záznam, volanie openpty() zlyhalo (/dev/pts nie je "
"pripojený?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr "Nie je zamknuté"
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Nedá sa upraviť súbor"
@@ -2882,6 +2920,9 @@ msgstr "Nedá sa upraviť súbor"
msgid "Connection closed prematurely"
msgstr "Spojenie bolo predčasne ukončené"
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Dynamickému MMap došlo miesto"
+
#~ msgid ""
#~ "Since you only requested a single operation it is extremely likely that\n"
#~ "the package is simply not installable and a bug report against\n"
diff --git a/po/sl.po b/po/sl.po
index 5f36b70b4..083d31397 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2005-02-16 22:18+0100\n"
"Last-Translator: Jure Cuhalev <gandalf@owca.info>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -155,49 +155,13 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s za %s %s preveden na %s %s\n"
#: cmdline/apt-cache.cc:1721
#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| " apt-cache [options] add file1 [file2 ...]\n"
-#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| " add - Add a package file to the source cache\n"
-#| " gencaches - Build both the package and source cache\n"
-#| " showpkg - Show some general information for a single package\n"
-#| " showsrc - Show source records\n"
-#| " stats - Show some basic statistics\n"
-#| " dump - Show the entire file in a terse form\n"
-#| " dumpavail - Print an available file to stdout\n"
-#| " unmet - Show unmet dependencies\n"
-#| " search - Search the package list for a regex pattern\n"
-#| " show - Show a readable record for the package\n"
-#| " depends - Show raw dependency information for a package\n"
-#| " rdepends - Show reverse dependency information for a package\n"
-#| " pkgnames - List the names of all packages\n"
-#| " dotty - Generate package graphs for GraphViz\n"
-#| " xvcg - Generate package graphs for xvcg\n"
-#| " policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| " -h This help text.\n"
-#| " -p=? The package cache.\n"
-#| " -s=? The source cache.\n"
-#| " -q Disable progress indicator.\n"
-#| " -i Show only important deps for the unmet command.\n"
-#| " -c=? Read this configuration file\n"
-#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -690,7 +654,7 @@ msgstr "Ni mogoe preimenovati %s v %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Napaka pri prevajanju regex - %s"
@@ -853,11 +817,11 @@ msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoeno."
msgid "Internal error, Ordering didn't finish"
msgstr "Notranja napaka pri dodajanju odklona"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Ni mogoe zakleniti imenika za prenose"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Seznama virov ni mogoe brati."
@@ -886,7 +850,7 @@ msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po odpakiranju bo sproenega %sB prostora na disku.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nimate dovolj prostora na %s"
@@ -923,7 +887,7 @@ msgstr "Prekini."
msgid "Do you want to continue [Y/n]? "
msgstr "Ali elite nadaljevati [Y/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ni mogoe dobiti %s %s\n"
@@ -932,7 +896,7 @@ msgstr "Ni mogoe dobiti %s %s\n"
msgid "Some files failed to download"
msgstr "Prenos nekaterih datotek ni uspel"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Prenos dokonan in uporabljen nain samo prenos"
@@ -1029,30 +993,35 @@ msgstr "Razliice '%s' za '%s' ni mogoe najti"
msgid "Selected version %s (%s) for %s\n"
msgstr "Izbrana razliica %s (%s) za %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "Ukaz update ne potrebuje argumentov"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Imenika seznamov ni mogoe zakleniti"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Naslednji NOVI paketi bodo nameeni:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1068,44 +1037,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Ni mogoe najti paketa %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Ni mogoe najti paketa %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Opomba: izbran %s namesto regex '%s'\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "vendar bo paket %s nameen"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Poskusite zagnati 'apt-get -f install', e elite popraviti:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1113,7 +1082,7 @@ msgstr ""
"Nereene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
"podajte reitev)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1124,126 +1093,126 @@ msgstr ""
"nemogo poloaj, e uporabljate nestabilno izdajo pa, da nekateri zahtevani "
"paketi e niso ustvarjeni ali preneeni iz Prihajajoe."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Pokvarjeni paketi"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Naslednji dodatni paketi bodo nameeni:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Predlagani paketi:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Priporoeni paketi:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Preraunavanje nadgradnje ... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Spodletelo"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Opravljeno"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega elite dobiti izorno kodo"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Izvornega paketa za %s ni mogoe najti"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Nimate dovolj prostora na %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Dobi vir %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Nekaterih arhivov ni mogoe dobiti."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Ukaz gradnje '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Otroki proces ni uspel"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega elite preveriti odvisnosti "
"za gradnjo"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni mogoe dobiti informacij o odvisnostih za gradnjo za %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nima odvisnosti za gradnjo.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s odvisnosti za %s ni mogoe zadostiti, ker ni mogoe najti paketa %s"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1252,31 +1221,31 @@ msgstr ""
"%s odvisnosti za %s ni mogoe zadostiti, ker nobena razliica paketa %s ne "
"more zadostiti zahtevi po razliici"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Ni mogoe zadostiti %s odvisnosti za %s. Nameen paket %s je preve nov"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Ni mogoe zadostiti %s odvisnosti za %s. %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Odvisnostim za gradnjo %s ni mogoe zadostiti."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Obdelava odvisnosti za gradnjo ni uspela"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Podprti moduli:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1293,7 +1262,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1890,7 +1859,7 @@ msgstr "Povezava podatkovne vtinice potekla"
msgid "Unable to accept connection"
msgstr "Ni mogoe sprejeti povezave"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Teava pri razprevanju datoteke"
@@ -1974,39 +1943,39 @@ msgstr "Prilo je do napake pri razreevanju '%s:%s' (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Ni se mogoe povezati z %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, fuzzy, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Ni mogoe razreiti '%s'"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Naslednji dodatni paketi bodo nameeni:"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2022,81 +1991,81 @@ msgstr "Ni mogoe odprti %s"
msgid "Read error from %s process"
msgstr "Napaka pri branju iz procesa %s"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "akanje na glave"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Dobljena je ena vrstica glave preko %u znakov"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Napana vrstica glave"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "Strenik HTTP je poslal napano glavo odgovora"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Strenik HTTP je poslal glavo z napano dolino vsebine"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Strenik HTTP je poslal glavo z napanim obsegom vsebine"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "Ta strenik HTTP ima pokvarjen obseg podpore"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Neznana oblika datuma"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Izbira ni uspela"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "as za povezavo se je iztekel"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Napaka pri pisanju v izhodno datoteko"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika "
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Napaka pri branju s strenika"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
#, fuzzy
msgid "Failed to truncate file"
msgstr "Napaka pri pisanju datoteke %s"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Napani podatki glave"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Povezava ni uspela"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Notranja napaka"
@@ -2109,11 +2078,38 @@ msgstr "mmap prazne datoteke ni mogo"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ni mogoe narediti mmap %lu bajtov"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Izbira %s ni mogoe najti"
@@ -2542,7 +2538,7 @@ msgstr "Ni mogoe najti gonilnika metod %s."
msgid "Method %s did not start correctly"
msgstr "Metoda %s se ni zaela pravilno"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2911,10 +2907,14 @@ msgstr "Odpiranje nastavitvene datoteke %s"
msgid "Completely removed %s"
msgstr "Odstranitev %s ni uspela"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
#, fuzzy
msgid "Could not patch file"
diff --git a/po/sv.po b/po/sv.po
index 7fca71fbb..e1aeb9066 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,14 +1,14 @@
# Advanced Package Tool - APT message translation catalog
# Swedish messages
# Peter Karlsson <peterk@debian.org>, 2002-2008.
-# Daniel Nylander <po@danielnylander.se>, 2005-2008.
+# Daniel Nylander <po@danielnylander.se>, 2005-2009.
#
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-13 00:28+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
+"PO-Revision-Date: 2009-03-03 23:15+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
"MIME-Version: 1.0\n"
@@ -158,7 +158,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s för %s kompilerad den %s %s\n"
@@ -336,7 +336,7 @@ msgstr "Listan över filtillägg för Sources är för lång"
#: ftparchive/apt-ftparchive.cc:368
msgid "Error writing header to contents file"
-msgstr "Fel vid skrivning av huvud till innehållsfil"
+msgstr "Fel vid skrivning av rubrik till innehållsfil"
#: ftparchive/apt-ftparchive.cc:398
#, c-format
@@ -659,7 +659,7 @@ msgstr "Misslyckades med att byta namn på %s till %s"
msgid "Y"
msgstr "J"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Fel vid kompilering av reguljärt uttryck - %s"
@@ -821,11 +821,11 @@ msgstr "Paketen måste tas bort men \"Remove\" är inaktiverat."
msgid "Internal error, Ordering didn't finish"
msgstr "Internt fel. Sorteringen färdigställdes inte"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Kunde inte låsa hämtningskatalogen"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Listan över källor kunde inte läsas."
@@ -857,7 +857,7 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunde inte fastställa ledigt utrymme i %s"
@@ -895,7 +895,7 @@ msgstr "Avbryter."
msgid "Do you want to continue [Y/n]? "
msgstr "Vill du fortsätta [J/n]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Misslyckades med att hämta %s %s\n"
@@ -904,7 +904,7 @@ msgstr "Misslyckades med att hämta %s %s\n"
msgid "Some files failed to download"
msgstr "Misslyckades med att hämta vissa filer"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Hämtningen färdig i \"endast-hämta\"-läge"
@@ -1002,31 +1002,36 @@ msgstr "Version \"%s\" för \"%s\" hittades inte"
msgid "Selected version %s (%s) for %s\n"
msgstr "Vald version %s (%s) för %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "Uppdateringskommandot tar inga argument"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Kunde inte låsa listkatalogen"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Det är inte meningen att vi ska ta bort något, kan inte starta AutoRemover"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Följande paket har installerats automatiskt och är inte längre nödvändiga:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Använd \"apt-get autoremove\" för att ta bort dem."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1044,44 +1049,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "Följande information kan vara till hjälp för att lösa situationen:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Internt fel, AutoRemover förstörde något"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internt fel, AllUpgrade förstörde något"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "Kunde inte hitta funktionen %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunde inte hitta paketet %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Observera, väljer %s för det reguljära uttrycket \"%s\"\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s är satt till manuellt installerad.\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Du kan möjligen rätta till detta genom att köra \"apt-get -f install\":"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1089,7 +1094,7 @@ msgstr ""
"Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket "
"(eller ange en lösning)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1101,115 +1106,115 @@ msgstr ""
"att några nödvändiga paket ännu inte har skapats eller flyttats\n"
"ut från \"Incoming\"."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Trasiga paket"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Följande ytterligare paket kommer att installeras:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Föreslagna paket:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Rekommenderade paket:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Beräknar uppgradering... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Misslyckades"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Färdig"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "Internt fel, problemlösaren förstörde någonting"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "Du måste ange minst ett paket att hämta källkod för"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunde inte hitta något källkodspaket för %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar över redan hämtade filen \"%s\"\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Behöver hämta %sB källkodsarkiv.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Hämtar källkoden %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Misslyckades med att hämta vissa arkiv."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Packar inte upp redan uppackad källkod i %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggkommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Barnprocessen misslyckades"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunde inte hämta information om byggberoenden för %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har inga byggberoenden.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1218,7 +1223,7 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
"hittas"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1227,32 +1232,33 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga "
"versioner av paketet %s tillfredsställer versionskraven"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade "
"paketet %s är för nytt"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggberoenden för %s kunde inte tillfredsställas."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Misslyckades med att behandla byggberoenden"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Moduler som stöds:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1268,7 +1274,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1461,7 +1467,7 @@ msgstr "Tar-kontrollsumma misslyckades, arkivet skadat"
#: apt-inst/contrib/extracttar.cc:296
#, c-format
msgid "Unknown TAR header type %u, member %s"
-msgstr "Okänd TAR-huvudtyp %u, del %s"
+msgstr "Okänd TAR-rubriktyp %u, del %s"
#: apt-inst/contrib/arfile.cc:70
msgid "Invalid archive signature"
@@ -1469,11 +1475,11 @@ msgstr "Ogiltig arkivsignatur"
#: apt-inst/contrib/arfile.cc:78
msgid "Error reading archive member header"
-msgstr "Fel vid läsning av huvud för arkivdel"
+msgstr "Fel vid läsning av rubrik för arkivdel"
#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
-msgstr "Ogiltigt arkivdelshuvud"
+msgstr "Ogiltigt arkivdelsrubrik"
#: apt-inst/contrib/arfile.cc:128
msgid "Archive is too short"
@@ -1481,7 +1487,7 @@ msgstr "Arkivet är för kort"
#: apt-inst/contrib/arfile.cc:132
msgid "Failed to read the archive headers"
-msgstr "Misslyckades med att läsa arkivhuvuden"
+msgstr "Misslyckades med att läsa arkivrubriker"
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
@@ -1669,7 +1675,7 @@ msgstr "Paketcachen måste först initieras"
#: apt-inst/deb/dpkgdb.cc:439
#, c-format
msgid "Failed to find a Package: header, offset %lu"
-msgstr "Misslyckades med att hitta Package:-huvud, position %lu"
+msgstr "Misslyckades med att hitta Package:-rubrik, position %lu"
#: apt-inst/deb/dpkgdb.cc:461
#, c-format
@@ -1872,7 +1878,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen"
msgid "Unable to accept connection"
msgstr "Kunde inte ta emot anslutningen"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem med att lägga filen till hashtabellen"
@@ -1960,41 +1966,41 @@ msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Kunde inte ansluta till %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Kunde inte komma åt nyckelring: \"%s\""
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Argumentslistan från Acquire::gpgv::Options är för lång. Avslutar."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Internt fel: Korrekt signatur men kunde inte fastställa nyckelns "
"fingeravtryck?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "Minst en ogiltig signatur träffades på."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Kunde inte köra \"%s\" för att verifiera signatur (är gpgv installerad?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Okänt fel vid körning av gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "Följande signaturer är ogiltiga:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2013,80 +2019,80 @@ msgstr "Kunde inte öppna rör för %s"
msgid "Read error from %s process"
msgstr "Läsfel från %s-processen"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
-msgstr "Väntar på huvuden"
+msgstr "Väntar på rubriker"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
-msgstr "Fick en ensam huvudrad på %u tecken"
+msgstr "Fick en ensam rubrikrad på %u tecken"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
-msgstr "Felaktig huvudrad"
+msgstr "Felaktig rubrikrad"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "Http-servern sände ett ogiltigt svarshuvud"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "Http-servern sände ett ogiltigt Content-Length-huvud"
+msgstr "Http-servern sände ett ogiltigt Content-Length-rubrik"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "Http-servern sände ett ogiltigt Content-Range-huvud"
+msgstr "Http-servern sände ett ogiltigt Content-Range-rubrik"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Okänt datumformat"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "\"Select\" misslyckades"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Anslutningen överskred tidsgränsen"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Fel vid skrivning till utdatafil"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Fel vid skrivning till fil"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Fel vid skrivning till filen"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Fel vid läsning från server"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "Misslyckades med att kapa av filen"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Felaktiga data i huvud"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Anslutningen misslyckades"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Internt fel"
@@ -2099,11 +2105,40 @@ msgstr "Kan inte utföra mmap på en tom fil"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunde inte utföra mmap på %lu byte"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Dynamisk MMap fick slut på utrymme"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Limit. "
+"Aktuellt värde: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Valet %s hittades inte"
@@ -2536,7 +2571,7 @@ msgstr "Metoddrivrutinen %s kunde inte hittas."
msgid "Method %s did not start correctly"
msgstr "Metoden %s startade inte korrekt"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2572,7 +2607,7 @@ msgstr "Du kan möjligen rätta till problemet genom att köra \"apt-get update\
# "Package" är en sträng i konfigurationsfilen
#: apt-pkg/policy.cc:267
msgid "Invalid record in the preferences file, no Package header"
-msgstr "Ogiltig post i konfigurationsfilen, \"Package\"-huvud saknas"
+msgstr "Ogiltig post i konfigurationsfilen, \"Package\"-rubriken saknas"
#: apt-pkg/policy.cc:289
#, c-format
@@ -2903,11 +2938,15 @@ msgstr "Förbereder borttagning av hela %s"
msgid "Completely removed %s"
msgstr "Tog bort hela %s"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Kan inte skriva loggfil, openpty() misslyckades (/dev/pts inte monterad?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Kunde inte lägga på programfix på filen"
@@ -2916,6 +2955,9 @@ msgstr "Kunde inte lägga på programfix på filen"
msgid "Connection closed prematurely"
msgstr "Anslutningen stängdes i förtid"
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Dynamisk MMap fick slut på utrymme"
+
#~ msgid ""
#~ "Since you only requested a single operation it is extremely likely that\n"
#~ "the package is simply not installable and a bug report against\n"
diff --git a/po/th.po b/po/th.po
index 847f267dd..a33a86ddf 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2008-11-06 15:54+0700\n"
"Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
"Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -157,49 +157,13 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s สำหรับ %s คอมไพล์เมื่อ %s %s\n"
#: cmdline/apt-cache.cc:1721
#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| " apt-cache [options] add file1 [file2 ...]\n"
-#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| " add - Add a package file to the source cache\n"
-#| " gencaches - Build both the package and source cache\n"
-#| " showpkg - Show some general information for a single package\n"
-#| " showsrc - Show source records\n"
-#| " stats - Show some basic statistics\n"
-#| " dump - Show the entire file in a terse form\n"
-#| " dumpavail - Print an available file to stdout\n"
-#| " unmet - Show unmet dependencies\n"
-#| " search - Search the package list for a regex pattern\n"
-#| " show - Show a readable record for the package\n"
-#| " depends - Show raw dependency information for a package\n"
-#| " rdepends - Show reverse dependency information for a package\n"
-#| " pkgnames - List the names of all packages\n"
-#| " dotty - Generate package graphs for GraphViz\n"
-#| " xvcg - Generate package graphs for xvcg\n"
-#| " policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| " -h This help text.\n"
-#| " -p=? The package cache.\n"
-#| " -s=? The source cache.\n"
-#| " -q Disable progress indicator.\n"
-#| " -i Show only important deps for the unmet command.\n"
-#| " -c=? Read this configuration file\n"
-#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -684,7 +648,7 @@ msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไป
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
@@ -845,11 +809,11 @@ msgstr "มีแพกเกจที่จำเป็นต้องถอด
msgid "Internal error, Ordering didn't finish"
msgstr "ข้อผิดพลาดภายใน: การเรียงลำดับไม่เสร็จสิ้น"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้"
@@ -878,7 +842,7 @@ msgstr "หลังจากการกระทำนี้ ต้องใ
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "หลังจากการกระทำนี้ เนื้อที่บนดิสก์จะว่างเพิ่มอีก %sB\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s"
@@ -915,7 +879,7 @@ msgstr "เลิกทำ"
msgid "Do you want to continue [Y/n]? "
msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?"
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "ไม่สามารถดาวน์โหลด %s %s\n"
@@ -924,7 +888,7 @@ msgstr "ไม่สามารถดาวน์โหลด %s %s\n"
msgid "Some files failed to download"
msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว"
@@ -1020,29 +984,34 @@ msgstr "ไม่พบรุ่น '%s' ของ '%s'"
msgid "Selected version %s (%s) for %s\n"
msgstr "เลือกรุ่น %s (%s) สำหรับ %s แล้ว\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "ไม่สามารถล็อคไดเรกทอรีรายชื่อแพกเกจ"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "ใช้ 'apt-get autoremove' เพื่อลบแพกเกจดังกล่าวได้"
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1060,43 +1029,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "ไม่พบงาน %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "ไม่พบแพกเกจ %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "หมายเหตุ: จะเลือก %s สำหรับนิพจน์เรกิวลาร์ '%s'\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "คุณอาจเรียก `apt-get -f install' เพื่อแก้ปัญหานี้ได้:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1104,7 +1073,7 @@ msgstr ""
"มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ "
"(หรือจะระบุทางแก้ก็ได้)"
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1115,122 +1084,122 @@ msgstr ""
"หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n"
"ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming"
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "แพกเกจมีปัญหา"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "แพกเกจที่แนะนำ:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "แพกเกจที่ควรใช้ร่วมกัน:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "กำลังคำนวณการปรับรุ่น... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "ล้มเหลว"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "เสร็จแล้ว"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "ดาวน์โหลดซอร์ส %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม"
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "คำสั่ง build '%s' ล้มเหลว\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "โพรเซสลูกล้มเหลว"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบแพกเกจ %s"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1239,30 +1208,31 @@ msgstr ""
"ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s "
"รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้"
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "มอดูลที่รองรับ:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1278,7 +1248,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1869,7 +1839,7 @@ msgstr "หมดเวลารอเชื่อมต่อซ็อกเก
msgid "Unable to accept connection"
msgstr "ไม่สามารถรับการเชื่อมต่อ"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม"
@@ -1953,38 +1923,38 @@ msgstr "เกิดปัญหาร้ายแรงบางอย่าง
msgid "Unable to connect to %s %s:"
msgstr "ไม่สามารถเชื่อมต่อไปยัง %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "ไม่สามารถเข้าใช้พวงกุญแจ: '%s'"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: รายการอาร์กิวเมนต์ใน Acquire::gpgv::Options ยาวเกินไป จะจบการทำงาน"
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ"
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "ไม่สามารถเรียก '%s' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2000,80 +1970,80 @@ msgstr "ไม่สามารถเปิดไปป์สำหรับ %s
msgid "Read error from %s process"
msgstr "เกิดข้อผิดพลาดขณะอ่านจากโพรเซส %s"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "รอหัวข้อมูล"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "ได้รับบรรทัดข้อมูลส่วนหัวยาวเกิน %u อักขระ"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "บรรทัดข้อมูลส่วนหัวผิดพลาด"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัวตอบมาไม่ถูกต้อง"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Length มาไม่ถูกต้อง"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Range มาไม่ถูกต้อง"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "การสนับสนุน Content-Range ที่เซิร์ฟเวอร์ HTTP ผิดพลาด"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "select ไม่สำเร็จ"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "หมดเวลารอเชื่อมต่อ"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "ไม่สามารถตัดท้ายแฟ้ม"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "ข้อมูลส่วนหัวผิดพลาด"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "เชื่อมต่อไม่สำเร็จ"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "ข้อผิดพลาดภายใน"
@@ -2086,11 +2056,38 @@ msgstr "ไม่สามารถ mmap แฟ้มเปล่า"
msgid "Couldn't make mmap of %lu bytes"
msgstr "ไม่สามารถสร้าง mmap ขนาด %lu ไบต์"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "เนื้อที่สำหรับทำ MMap แบบพลวัตเต็มแล้ว"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "ไม่พบรายการเลือก %s"
@@ -2515,7 +2512,7 @@ msgstr "ไม่พบไดรเวอร์สำหรับวิธีก
msgid "Method %s did not start correctly"
msgstr "ไม่สามารถเรียกทำงานวิธีการ %s"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter"
@@ -2872,12 +2869,16 @@ msgstr "กำลังเตรียมถอดถอน %s อย่าง
msgid "Completely removed %s"
msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"ไม่สามารถเขียนบันทึกปฏิบัติการ เนื่องจาก openpty() ล้มเหลว (ไม่ได้เมานท์ /dev/pts "
"หรือเปล่า?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "ไม่สามารถแพตช์แฟ้ม"
@@ -2886,6 +2887,9 @@ msgstr "ไม่สามารถแพตช์แฟ้ม"
msgid "Connection closed prematurely"
msgstr "การเชื่อมต่อถูกปิดก่อนเวลาอันควร"
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "เนื้อที่สำหรับทำ MMap แบบพลวัตเต็มแล้ว"
+
#~ msgid ""
#~ "Since you only requested a single operation it is extremely likely that\n"
#~ "the package is simply not installable and a bug report against\n"
diff --git a/po/tl.po b/po/tl.po
index 03c743225..870260d85 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2007-03-29 21:36+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -162,49 +162,13 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para sa %s %s kinompile noong %s %s\n"
#: cmdline/apt-cache.cc:1721
#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| " apt-cache [options] add file1 [file2 ...]\n"
-#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| " add - Add a package file to the source cache\n"
-#| " gencaches - Build both the package and source cache\n"
-#| " showpkg - Show some general information for a single package\n"
-#| " showsrc - Show source records\n"
-#| " stats - Show some basic statistics\n"
-#| " dump - Show the entire file in a terse form\n"
-#| " dumpavail - Print an available file to stdout\n"
-#| " unmet - Show unmet dependencies\n"
-#| " search - Search the package list for a regex pattern\n"
-#| " show - Show a readable record for the package\n"
-#| " depends - Show raw dependency information for a package\n"
-#| " rdepends - Show reverse dependency information for a package\n"
-#| " pkgnames - List the names of all packages\n"
-#| " dotty - Generate package graphs for GraphViz\n"
-#| " xvcg - Generate package graphs for xvcg\n"
-#| " policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| " -h This help text.\n"
-#| " -p=? The package cache.\n"
-#| " -s=? The source cache.\n"
-#| " -q Disable progress indicator.\n"
-#| " -i Show only important deps for the unmet command.\n"
-#| " -c=? Read this configuration file\n"
-#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -702,7 +666,7 @@ msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
msgid "Y"
msgstr "O"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Error sa pag-compile ng regex - %s"
@@ -867,11 +831,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Hindi maaldaba ang directory ng download"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
@@ -903,7 +867,7 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Hindi matantsa ang libreng puwang sa %s"
@@ -940,7 +904,7 @@ msgstr "Abort."
msgid "Do you want to continue [Y/n]? "
msgstr "Nais niyo bang magpatuloy [O/h]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Bigo sa pagkuha ng %s %s\n"
@@ -949,7 +913,7 @@ msgstr "Bigo sa pagkuha ng %s %s\n"
msgid "Some files failed to download"
msgstr "May mga talaksang hindi nakuha"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
@@ -1047,30 +1011,35 @@ msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
msgid "Selected version %s (%s) for %s\n"
msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Hindi maaldaba ang directory ng talaan"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1086,46 +1055,46 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr ""
"Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Error na internal, may nasira ang problem resolver"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ngunit ang %s ay iluluklok"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1133,7 +1102,7 @@ msgstr ""
"May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
"mga pakete (o magtakda ng solusyon)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1144,115 +1113,115 @@ msgstr ""
"o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n"
"kailangan na hindi pa nalikha o linipat mula sa Incoming."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Sirang mga pakete"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Mga paketeng mungkahi:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Mga paketeng rekomendado:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Sinusuri ang pag-upgrade... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Bigo"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Tapos"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "Error na internal, may nasira ang problem resolver"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Hindi mahanap ang paketeng source para sa %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Kulang kayo ng libreng puwang sa %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Kunin ang Source %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Bigo sa pagkuha ng ilang mga arkibo."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Utos na build '%s' ay bigo.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Bigo ang prosesong anak"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Hindi makuha ang impormasyong build-dependency para sa %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "Walang build depends ang %s.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1261,7 +1230,7 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1270,32 +1239,32 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon "
"ng paketeng %s na tumutugon sa kinakailangang bersyon"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %"
"s ay bagong-bago pa lamang."
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Hindi mabuo ang build-dependencies para sa %s."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Bigo sa pagproseso ng build dependencies"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Suportadong mga Module:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1312,7 +1281,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1911,7 +1880,7 @@ msgstr "Nag-timeout ang socket ng datos"
msgid "Unable to accept connection"
msgstr "Hindi makatanggap ng koneksyon"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema sa pag-hash ng talaksan"
@@ -1995,43 +1964,43 @@ msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Hindi maka-konekta sa %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Hindi mabasa ang keyring: '%s'"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Sobrang haba ng talaan ng argumento mula sa Acquire::gpgv::Options. "
"Lalabas."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Error na internal: Tanggap na lagda, ngunit hindi malaman ang key "
"fingerprint?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Hindi kilalang error sa pag-execute ng gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "Ang sumusunod na mga lagda ay imbalido:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2049,81 +2018,81 @@ msgstr "Hindi makapag-bukas ng pipe para sa %s"
msgid "Read error from %s process"
msgstr "Error sa pagbasa mula sa prosesong %s"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Naghihintay ng panimula"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Maling linyang panimula"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "Nagpadala ang HTTP server ng di tanggap na reply header"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "Sira ang range support ng HTTP server na ito"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Di kilalang anyo ng petsa"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Bigo ang pagpili"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Nag-timeout ang koneksyon"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Error sa pagsulat ng talaksang output"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Error sa pagsulat sa talaksan"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Error sa pagsusulat sa talaksan"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Error sa pagbasa mula sa server"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
#, fuzzy
msgid "Failed to truncate file"
msgstr "Bigo sa pagsulat ng talaksang %s"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Maling datos sa panimula"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Bigo ang koneksyon"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Internal na error"
@@ -2136,11 +2105,38 @@ msgstr "Hindi mai-mmap ang talaksang walang laman"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Hindi makagawa ng mmap ng %lu na byte"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Piniling %s ay hindi nahanap"
@@ -2577,7 +2573,7 @@ msgstr "Ang driver ng paraang %s ay hindi mahanap."
msgid "Method %s did not start correctly"
msgstr "Hindi umandar ng tama ang paraang %s"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2951,10 +2947,14 @@ msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
msgid "Completely removed %s"
msgstr "Natanggal ng lubusan ang %s"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Hindi mai-patch ang talaksan"
diff --git a/po/uk.po b/po/uk.po
index ca4b25db0..b732afa46 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-all\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2006-07-29 15:57+0300\n"
"Last-Translator: Artem Bondarenko <artem.brz@gmail.com>\n"
"Language-Team: Українська <uk@li.org>\n"
@@ -158,49 +158,13 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s для %s %s скомпільовано %s %s\n"
#: cmdline/apt-cache.cc:1721
#, fuzzy
-#| msgid ""
-#| "Usage: apt-cache [options] command\n"
-#| " apt-cache [options] add file1 [file2 ...]\n"
-#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-#| "\n"
-#| "apt-cache is a low-level tool used to manipulate APT's binary\n"
-#| "cache files, and query information from them\n"
-#| "\n"
-#| "Commands:\n"
-#| " add - Add a package file to the source cache\n"
-#| " gencaches - Build both the package and source cache\n"
-#| " showpkg - Show some general information for a single package\n"
-#| " showsrc - Show source records\n"
-#| " stats - Show some basic statistics\n"
-#| " dump - Show the entire file in a terse form\n"
-#| " dumpavail - Print an available file to stdout\n"
-#| " unmet - Show unmet dependencies\n"
-#| " search - Search the package list for a regex pattern\n"
-#| " show - Show a readable record for the package\n"
-#| " depends - Show raw dependency information for a package\n"
-#| " rdepends - Show reverse dependency information for a package\n"
-#| " pkgnames - List the names of all packages\n"
-#| " dotty - Generate package graphs for GraphViz\n"
-#| " xvcg - Generate package graphs for xvcg\n"
-#| " policy - Show policy settings\n"
-#| "\n"
-#| "Options:\n"
-#| " -h This help text.\n"
-#| " -p=? The package cache.\n"
-#| " -s=? The source cache.\n"
-#| " -q Disable progress indicator.\n"
-#| " -i Show only important deps for the unmet command.\n"
-#| " -c=? Read this configuration file\n"
-#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -700,7 +664,7 @@ msgstr "Не вдалося перейменувати %s в %s"
msgid "Y"
msgstr "Т"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Помилка компіляції регулярного виразу - %s"
@@ -865,11 +829,11 @@ msgstr "Пакунки необхідно видалити, але видале
msgid "Internal error, Ordering didn't finish"
msgstr "Внутрішня помилка, Ordering не завершилася"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Неможливо заблокувати теку для завантаження"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Неможливо прочитати перелік джерел."
@@ -899,7 +863,7 @@ msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
"Після розпакування об'єм зайнятого дискового простору зменшиться на %sB.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Не вдалося визначити кількість вільного місця в %s"
@@ -938,7 +902,7 @@ msgstr "Перервано."
msgid "Do you want to continue [Y/n]? "
msgstr "Бажаєте продовжити [Т/н]? "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Не вдалося завантажити %s %s\n"
@@ -947,7 +911,7 @@ msgstr "Не вдалося завантажити %s %s\n"
msgid "Some files failed to download"
msgstr "Деякі файли не вдалося завантажити"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Вказано режим \"тільки завантаження\", і завантаження завершено"
@@ -1047,30 +1011,35 @@ msgstr "Версія '%s' для '%s' не знайдена"
msgid "Selected version %s (%s) for %s\n"
msgstr "Обрана версія %s (%s) для %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "Команді update не потрібні аргументи"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Неможливо заблокувати теку з переліками пакунків"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
#, fuzzy
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "НОВІ пакунки були встановлені автоматично і більше не потрібні:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Використовуйте 'apt-get autoremove' щоб видалити їх."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1088,46 +1057,46 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "Наступна інформація можливо допоможе Вам:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Внутрішня помилка, вирішувач проблем все поламав"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Внутрішня помилка, AllUpgrade все поламав"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Не можу знайти пакунок %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Не можу знайти пакунок %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Помітьте, регулярний вираз %2$s призводить до вибору %1$s\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "але %s буде встановлений"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f "
"install':"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1135,7 +1104,7 @@ msgstr ""
"Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не "
"вказуючи імені пакунка (або знайдіть інше рішення)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1146,121 +1115,121 @@ msgstr ""
"або ж використаєте нестабільний дистрибутив, і запитані Вами пакунки\n"
"ще не створені або були вилучені з Incoming."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Зламані пакунки"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Будуть встановлені наступні додаткові пакунки:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Пропоновані пакунки:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Рекомендовані пакунки:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Обчислення оновлень... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Невдача"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Виконано"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "Внутрішня помилка, вирішувач проблем все поламав"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
"тексти"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Неможливо знайти пакунок з вихідними текстами для %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускаємо вже завантажений файл '%s'\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Недостатньо місця в %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Завантаження вихідних текстів %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Деякі архіви не вдалося завантажити."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Розпакування вихідних текстів пропущено, тому що в %s вже перебувають "
"розпаковані вихідні тексти\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда розпакування '%s' завершилася невдало.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда побудови '%s' закінчилася невдало.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Породжений процес завершився невдало"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Для перевірки залежностей для побудови необхідно вказати як мінімум один "
"пакунок"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Неможливо одержати інформацію про залежності для побудови %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не має залежностей для побудови.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1268,7 +1237,7 @@ msgid ""
msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1277,32 +1246,32 @@ msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо ні одна з версій "
"пакунка %s не задовольняє умови"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Не вдалося задовольнити залежність типу %s для пакунка %s: Встановлений "
"пакунок %s новіше, аніж треба"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Залежності для побудови %s не можуть бути задоволені."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Обробка залежностей для побудови закінчилася невдало"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Підтримувані модулі:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1319,7 +1288,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1928,7 +1897,7 @@ msgstr "Час з'єднання з сокетом даних вичерпавс
msgid "Unable to accept connection"
msgstr "Неможливо прийняти з'єднання"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Проблема хешування файла"
@@ -2012,41 +1981,41 @@ msgstr "Сталося щось дивне при спробі отримати
msgid "Unable to connect to %s %s:"
msgstr "Не можливо під'єднатися до %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, fuzzy, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Неможливо отримати доступ до keyring: '%s'"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
"E: Перелік аргументів з Acquire::gpgv::Options занадто довгий. Відміна."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його "
"відбиток?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "Знайдено як мінімум один невірний підпис."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "Неможливо виконати '%s' для перевірки підпису, gpgv встановлено?"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Невідома помилка виконання gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "Слідуючі підписи були невірними:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2064,83 +2033,83 @@ msgstr "Неможливо відкрити канал (pipe) для %s"
msgid "Read error from %s process"
msgstr "Помилка читання з процесу %s"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Очікування на заголовки"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Отримано одну заголовкову лінію понад %u символів"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Невірна лінія заголовку"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP сервер відіслав невірний заголовок 'reply'"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "Цей HTTP сервер має поламану підтримку 'range'"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Невідомий формат дати"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Вибір не вдався"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Час очікування з'єднання вийшов"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Помилка запису в вихідний файл"
-#: methods/http.cc:833
+#: methods/http.cc:841
#, fuzzy
msgid "Error writing to file"
msgstr "Помилка запису в файл"
-#: methods/http.cc:861
+#: methods/http.cc:869
#, fuzzy
msgid "Error writing to the file"
msgstr "Помилка запису в файл"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "Помилка читання з сервера. Віддалена сторона закрила з'єднання"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Помилка читання з сервера"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
#, fuzzy
msgid "Failed to truncate file"
msgstr "Не вдалося записати файл %s"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Погана заголовкова інформація"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "З'єднання не вдалося"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Внутрішня помилка"
@@ -2153,11 +2122,38 @@ msgstr "Неможливо відобразити в пам'яті пустий
msgid "Couldn't make mmap of %lu bytes"
msgstr "Неможливо відобразити в пам'яті %lu байт"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Вибір %s не знайдено"
@@ -2595,7 +2591,7 @@ msgstr "Драйвер для метода %s не знайдено."
msgid "Method %s did not start correctly"
msgstr "Метод %s не стартував коректно"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -2961,11 +2957,15 @@ msgstr "Підготовка до повного видалення %s"
msgid "Completely removed %s"
msgstr "Повністю видалено %s"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Неможливо записати в лог, проблема з openpty() (не змонтовано /dev/pts?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Неможливо накласти латку на файл"
diff --git a/po/vi.po b/po/vi.po
index 31fa1e90d..8d4295cf1 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.14\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2008-12-22 19:04+1030\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -160,7 +160,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s cho %s được biên dịch trên %s %s\n"
@@ -684,7 +684,7 @@ msgstr "Việc đổi tên %s thành %s bị lỗi"
msgid "Y"
msgstr "C"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "Lỗi biên dich biểu thức chính quy - %s"
@@ -847,11 +847,11 @@ msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ
msgid "Internal error, Ordering didn't finish"
msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "Không thể khóa thư mục tải về"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Không thể đọc danh sách nguồn."
@@ -881,7 +881,7 @@ msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được chiếm.\
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được giải phóng.\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Không thể quyết định chỗ rảnh trong %s"
@@ -919,7 +919,7 @@ msgstr "Hủy bỏ."
msgid "Do you want to continue [Y/n]? "
msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] "
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Việc gói %s bị lỗi %s\n"
@@ -928,7 +928,7 @@ msgstr "Việc gói %s bị lỗi %s\n"
msgid "Some files failed to download"
msgstr "Một số tập tin không tải về được"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "Mới tải về xong và trong chế độ chỉ tải về"
@@ -1027,30 +1027,35 @@ msgstr "Không tìm thấy phiên bản « %s » cho « %s »"
msgid "Selected version %s (%s) for %s\n"
msgstr "Đã chọn phiên bản %s (%s) cho %s\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "Lệnh cập nhật không chấp nhật đối số"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "Không thể khóa thư mục danh sách"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tự động"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Theo đây có những gói đã được cài đặt tự động nên không còn cần thiết lại:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Hãy sử dụng lệnh « apt-get autoremove » để gỡ bỏ chúng."
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1068,43 +1073,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Lỗi nội bộ : Bộ Gỡ bỏ Tự động đã làm hư gì."
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "Không tìm thấy tác vụ %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "Không tìm thấy gói %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s được đặt thành « được cài đặt bằng tay ».\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1112,7 +1117,7 @@ msgstr ""
"Gói còn phụ thuộc vào phần mềm chưa có. Hãy cố chạy lệnh « apt-get -f install "
"» mà không có gói nào (hoặc ghi rõ cách quyết định)."
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1124,123 +1129,123 @@ msgstr ""
"bất định, có lẽ chưa tạo một số gói cần thiết,\n"
"hoặc chưa di chuyển chúng ra phần Incoming (Đến)."
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "Gói bị ngắt"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "Những gói thêm theo đây sẽ được cài đặt:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "Gói được đệ nghị:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "Gói được khuyên:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "Đang tính nâng cấp... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "Bị lỗi"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "Xong"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Không tìm thấy gói nguồn cho %s"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Không đủ sức chứa còn rảnh trong %s"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Cần phải lấy %sB/%sB kho nguồn.\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Cần phải lấy %sB kho nguồn.\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "Lấy nguồn %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "Việc lấy một số kho bị lỗi."
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Lệnh giải nén « %s » bị lỗi.\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Lệnh xây dụng « %s » bị lỗi.\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "Tiến trình con bị lỗi"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s không phụ thuộc vào gì khi xây dụng.\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1249,31 +1254,32 @@ msgstr ""
"cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng "
"của gói %s có thể thỏa điều kiện phiên bản."
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s."
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s."
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "Mô-đun đã hỗ trợ :"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1289,7 +1295,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1902,7 +1908,7 @@ msgstr "Kết nối ổ cắm dữ liệu đã quá giờ"
msgid "Unable to accept connection"
msgstr "Không thể chấp nhận kết nối"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Gặp khó khăn băm tập tin"
@@ -1986,39 +1992,39 @@ msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ « %s:%s » (%i)"
msgid "Unable to connect to %s %s:"
msgstr "Không thể kết nối đến %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "Không thể truy cập vòng khoá « %s »"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "E: Danh sách lệnh từ « Acquire::gpgv::Options » quá dài nên thoát."
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Lỗi nội bộ: chữ ký đúng, nhưng không thể quyết định vân tay khóa ?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "Gặp ít nhất một chữ ký không hợp lệ."
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
"Không thể thực hiện « %s » để kiểm chứng chữ ký (gpgv có được cài đặt chưa?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "Gặp lỗi lạ khi thực hiện gpgv"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "Những chữ ký theo đây là không hợp lệ:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2035,84 +2041,84 @@ msgstr "Không thể mở ống dẫn cho %s"
msgid "Read error from %s process"
msgstr "Gặp lỗi đọc từ tiến trình %s"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "Đang đợi những phần đầu..."
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Đã lấy một dòng đầu riêng lẻ chứa hơn %u ky tự"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "Dòng đầu sai"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "Máy phục vụ HTTP đã gởi một dòng đầu trả lời không hợp lệ"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
"Máy phục vụ HTTP đã gởi một dòng đầu Content-Length (độ dài nội dụng) không "
"hợp lệ"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
"Máy phục vụ HTTP đã gởi một dòng đầu Content-Range (phạm vị nội dụng) không "
"hợp lệ"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "Không biết dạng ngày"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "Việc chọn bị lỗi"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "Kết nối đã quá giờ"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "Gặp lỗi khi ghi vào tập tin xuất"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "Gặp lỗi khi ghi vào tập tin"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "Gặp lỗi khi ghi vào tập tin đó"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng kết nối"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "Gặp lỗi khi đọc từ máy phục vụ"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "Lỗi cắt ngắn tập tin"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "Dữ liệu dòng đầu sai"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "Kết nối bị ngắt"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "Gặp lỗi nội bộ"
@@ -2125,11 +2131,38 @@ msgstr "Không thể mmap (ảnh xạ bộ nhớ) tâp tin rỗng"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "Hết chỗ tạo sơ đồ bộ nhớ động (Dynamic MMap)"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "Không tìm thấy vùng chọn %s"
@@ -2559,7 +2592,7 @@ msgstr "Không tìm thấy trình điều khiển phương pháp %s."
msgid "Method %s did not start correctly"
msgstr "Phương pháp %s đã không bắt đầu cho đúng."
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Hãy nạp đĩa có nhãn « %s » vào ổ « %s » và bấm nút Enter."
@@ -2929,10 +2962,14 @@ msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s..."
msgid "Completely removed %s"
msgstr "Mới gỡ bỏ hoàn toàn %s"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "Không thể ghi lưu, openpty() bị lỗi (« /dev/pts » chưa lắp ?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "Không thể vá lỗi trong tập tin %s"
@@ -2941,6 +2978,9 @@ msgstr "Không thể vá lỗi trong tập tin %s"
msgid "Connection closed prematurely"
msgstr "Kết nối bị đóng quá sớm."
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Hết chỗ tạo sơ đồ bộ nhớ động (Dynamic MMap)"
+
#~ msgid ""
#~ "Since you only requested a single operation it is extremely likely that\n"
#~ "the package is simply not installable and a bug report against\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b2b2468f7..abb4585ce 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-11-12 22:07+0100\n"
-"PO-Revision-Date: 2008-11-15 00:49+0800\n"
+"PO-Revision-Date: 2009-06-01 15:54+0800\n"
"Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n"
"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -2054,9 +2054,14 @@ msgstr "无法 mmap 一个空文件"
msgid "Couldn't make mmap of %lu bytes"
msgstr "无法 mmap %lu 字节的数据"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
-msgstr "动态内存映射(Dynamic MMap)空间不足"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大侠。当前值:%lu。(man 5 "
+"apt.conf)"
#: apt-pkg/contrib/strutl.cc:1014
#, c-format
@@ -2857,6 +2862,9 @@ msgstr "无法打开补丁文件"
msgid "Connection closed prematurely"
msgstr "连接被永久关闭"
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "动态内存映射(Dynamic MMap)空间不足"
+
#~ msgid ""
#~ "Since you only requested a single operation it is extremely likely that\n"
#~ "the package is simply not installable and a bug report against\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ce7ebc21d..49d80ea3c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.5.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-12 22:07+0100\n"
+"POT-Creation-Date: 2009-04-22 12:25+0200\n"
"PO-Revision-Date: 2009-01-28 10:41+0800\n"
"Last-Translator: Tetralet <tetralet@gmail.com>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -158,7 +158,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s 是用於 %s 並在 %s %s 上編譯的\n"
@@ -650,7 +650,7 @@ msgstr "無法將 %s 更名為 %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658
#, c-format
msgid "Regex compilation error - %s"
msgstr "編譯正規表示式時發生錯誤 - %s"
@@ -811,11 +811,11 @@ msgstr "有套件需要被移除,但卻被禁止移除。"
msgid "Internal error, Ordering didn't finish"
msgstr "內部錯誤,排序未能完成"
-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032
msgid "Unable to lock the download directory"
msgstr "無法鎖定下載目錄"
-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "無法讀取來源列表。"
@@ -844,7 +844,7 @@ msgstr "此操作完成之後,會多佔用 %sB 的磁碟空間。\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "此操作完成之後,會空出 %sB 的磁碟空間。\n"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "無法確認 %s 的未使用空間"
@@ -881,7 +881,7 @@ msgstr "放棄執行。"
msgid "Do you want to continue [Y/n]? "
msgstr "是否繼續進行 [Y/n]?"
-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "無法取得 %s,%s\n"
@@ -890,7 +890,7 @@ msgstr "無法取得 %s,%s\n"
msgid "Some files failed to download"
msgstr "有部份檔案無法下載"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232
msgid "Download complete and in download only mode"
msgstr "下載完成,且這是『僅下載』模式"
@@ -986,29 +986,34 @@ msgstr "找不到 '%s' 版的 '%s'"
msgid "Selected version %s (%s) for %s\n"
msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1345
msgid "The update command takes no arguments"
msgstr "update 指令不需任何參數"
-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1358
msgid "Unable to lock the list directory"
msgstr "無法鎖定列表目錄"
-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1410
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "我們沒有計劃要刪除任何東西,無法啟動 AutoRemover"
-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1442
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr "以下套件是被自動安裝進來的,且已不再會被用到了:"
-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1444
msgid "Use 'apt-get autoremove' to remove them."
msgstr "使用 'apt-get autoremove' 來將其移除。"
-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1449
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1026,43 +1031,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735
+#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742
msgid "The following information may help to resolve the situation:"
msgstr "以下的資訊或許有助於解決當前的情況:"
-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1456
msgid "Internal Error, AutoRemover broke stuff"
msgstr "內部錯誤,AutoRemover 處理失敗"
-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1475
msgid "Internal error, AllUpgrade broke stuff"
msgstr "內部錯誤,AllUpgrade 造成了損壞"
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1530
#, c-format
msgid "Couldn't find task %s"
msgstr "無法找到主題 %s"
-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681
#, c-format
msgid "Couldn't find package %s"
msgstr "無法找到套件 %s"
-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1668
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意,根據正規表示式 '%2$s' 而選擇了 %1$s\n"
-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1699
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被設定為手動安裝。\n"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1712
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "您也許得執行 `apt-get -f install' 以修正這些問題:"
-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1715
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1070,7 +1075,7 @@ msgstr ""
"未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'(或採取其它的解"
"決方案)。"
-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1727
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
@@ -1080,122 +1085,122 @@ msgstr ""
"有些套件無法安裝。這可能意謂著您的要求難以解決,或是若您使用的是\n"
"unstable 發行版,可能有些必要的套件尚未建立,或是被移出 Incoming 了。"
-#: cmdline/apt-get.cc:1738
+#: cmdline/apt-get.cc:1745
msgid "Broken packages"
msgstr "損毀的套件"
-#: cmdline/apt-get.cc:1767
+#: cmdline/apt-get.cc:1774
msgid "The following extra packages will be installed:"
msgstr "下列的額外套件將被安裝:"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1863
msgid "Suggested packages:"
msgstr "建議套件:"
-#: cmdline/apt-get.cc:1857
+#: cmdline/apt-get.cc:1864
msgid "Recommended packages:"
msgstr "推薦套件:"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1892
msgid "Calculating upgrade... "
msgstr "籌備升級中... "
-#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112
msgid "Failed"
msgstr "失敗"
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1900
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975
msgid "Internal error, problem resolver broke stuff"
msgstr "內部錯誤,問題排除器造成了損壞"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2075
msgid "Must specify at least one package to fetch source for"
msgstr "在取得原始碼時必須至少指定一個套件"
-#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344
#, c-format
msgid "Unable to find a source package for %s"
msgstr "無法找到 %s 的原始碼套件"
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2154
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "略過已下載的檔案 '%s'\n"
-#: cmdline/apt-get.cc:2175
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "You don't have enough free space in %s"
msgstr "在 %s 裡沒有足夠的的未使用空間"
-#: cmdline/apt-get.cc:2181
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下載 %sB/%sB 的原始套件檔。\n"
-#: cmdline/apt-get.cc:2184
+#: cmdline/apt-get.cc:2191
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下載 %sB 的原始套件檔。\n"
-#: cmdline/apt-get.cc:2190
+#: cmdline/apt-get.cc:2197
#, c-format
msgid "Fetch source %s\n"
msgstr "取得原始碼 %s\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2228
msgid "Failed to fetch some archives."
msgstr "無法取得某些套件檔。"
-#: cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2256
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "不解開,因原始碼已解開至 %s\n"
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "解開指令 '%s' 失敗。\n"
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:2269
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2286
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "編譯指令 '%s' 失敗。\n"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2305
msgid "Child process failed"
msgstr "子程序失敗"
-#: cmdline/apt-get.cc:2314
+#: cmdline/apt-get.cc:2321
msgid "Must specify at least one package to check builddeps for"
msgstr "在檢查編譯相依關係時必須至少指定一個套件"
-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "無法取得 %s 的編譯相依關係資訊"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2369
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 沒有編譯相依關係。\n"
-#: cmdline/apt-get.cc:2414
+#: cmdline/apt-get.cc:2421
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係,因為找不到套件 %3$s"
-#: cmdline/apt-get.cc:2467
+#: cmdline/apt-get.cc:2474
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1203,30 +1208,31 @@ msgid ""
msgstr ""
"無法滿足 %2$s 所要求的 %1$s 相依關係,因為套件 %3$s 沒有版本符合其版本需求"
-#: cmdline/apt-get.cc:2503
+#: cmdline/apt-get.cc:2510
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "無法滿足 %2$s 的相依關係 %1$s:已安裝的套件 %3$s 太新了"
-#: cmdline/apt-get.cc:2528
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "無法滿足 %2$s 的相依關係 %1$s:%3$s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "無法滿足套件 %s 的編譯相依關係。"
-#: cmdline/apt-get.cc:2546
+#: cmdline/apt-get.cc:2555
msgid "Failed to process build dependencies"
msgstr "無法處理編譯相依關係"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2587
msgid "Supported modules:"
msgstr "已支援模組:"
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2628
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1242,7 +1248,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove and purge packages\n"
+" purge - Remove packages and config files\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1833,7 +1839,7 @@ msgstr "Data socket 連線逾時"
msgid "Unable to accept connection"
msgstr "無法接受連線"
-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "有問題的雜湊檔"
@@ -1917,38 +1923,38 @@ msgstr "在解析 '%s:%s' (%i) 時出了怪事"
msgid "Unable to connect to %s %s:"
msgstr "無法連線至 %s %s:"
-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr "無法存取鑰匙圈:'%s'"
-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr "錯誤:Acquire::gpgv::Options 的參數列表過長。結束執行。"
-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "內部錯誤:簽章無誤,但卻無法辨識密鑰的指紋碼?!"
-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr "至少發現一個無效的簽章。"
-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr "無法執行 '%s' 來驗證簽章(gpgv 是否安裝了?)"
-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr "在執行 gpgv 時發生未知的錯誤"
-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr "以下簽名無效:\n"
-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1964,80 +1970,80 @@ msgstr "無法開啟管線給 %s 使用"
msgid "Read error from %s process"
msgstr "由 %s 程序讀取錯誤"
-#: methods/http.cc:377
+#: methods/http.cc:379
msgid "Waiting for headers"
msgstr "等待標頭"
-#: methods/http.cc:523
+#: methods/http.cc:525
#, c-format
msgid "Got a single header line over %u chars"
msgstr "取得一個單行超過 %u 字元的標頭"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Bad header line"
msgstr "標頭行錯誤"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP 伺服器傳送了一個無效的回覆標頭"
-#: methods/http.cc:586
+#: methods/http.cc:588
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP 伺服器傳送了一個無效的 Content-Length 標頭"
-#: methods/http.cc:601
+#: methods/http.cc:603
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP 伺服器傳送了一個無效的 Content-Range 標頭"
-#: methods/http.cc:603
+#: methods/http.cc:605
msgid "This HTTP server has broken range support"
msgstr "這個 HTTP 伺服器的範圍支援有問題"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Unknown date format"
msgstr "未知的資料格式"
-#: methods/http.cc:774
+#: methods/http.cc:782
msgid "Select failed"
msgstr "選擇失敗"
-#: methods/http.cc:779
+#: methods/http.cc:787
msgid "Connection timed out"
msgstr "連線逾時"
-#: methods/http.cc:802
+#: methods/http.cc:810
msgid "Error writing to output file"
msgstr "在寫入輸出檔時發生錯誤"
-#: methods/http.cc:833
+#: methods/http.cc:841
msgid "Error writing to file"
msgstr "在寫入檔案時發生錯誤"
-#: methods/http.cc:861
+#: methods/http.cc:869
msgid "Error writing to the file"
msgstr "在寫入該檔時發生錯誤"
-#: methods/http.cc:875
+#: methods/http.cc:883
msgid "Error reading from server. Remote end closed connection"
msgstr "在讀取伺服器時發生錯誤,遠端主機已關閉連線"
-#: methods/http.cc:877
+#: methods/http.cc:885
msgid "Error reading from server"
msgstr "在讀取伺服器時發生錯誤"
-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
msgid "Failed to truncate file"
msgstr "無法截短檔案"
-#: methods/http.cc:1105
+#: methods/http.cc:1141
msgid "Bad header data"
msgstr "錯誤的標頭資料"
-#: methods/http.cc:1122 methods/http.cc:1177
+#: methods/http.cc:1158 methods/http.cc:1213
msgid "Connection failed"
msgstr "連線失敗"
-#: methods/http.cc:1229
+#: methods/http.cc:1305
msgid "Internal error"
msgstr "內部錯誤"
@@ -2050,11 +2056,40 @@ msgstr "不能 mmap 空白檔案"
msgid "Couldn't make mmap of %lu bytes"
msgstr "無法 mmap 到 %lu 位元組"
-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"動態 MMap 已用完所有空間。請增加 APT::Cache-Limit 的大小。目前大小為:%lu。"
+"(man 5 apt.conf)"
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1014
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1018
#, c-format
msgid "Selection %s not found"
msgstr "選項 %s 找不到"
@@ -2477,7 +2512,7 @@ msgstr "找不到安裝方式的驅動程式 %s。"
msgid "Method %s did not start correctly"
msgstr "安裝方式 %s 沒有正確啟動"
-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中,然後按下 [Enter] 鍵。"
@@ -2834,10 +2869,14 @@ msgstr "正在準備完整移除 %s"
msgid "Completely removed %s"
msgstr "已完整移除 %s"
-#: apt-pkg/deb/dpkgpm.cc:791
+#: apt-pkg/deb/dpkgpm.cc:789
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr "無法寫入記錄檔,openpty() 失敗(/dev/pts 未掛載?)\n"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
#: methods/rred.cc:219
msgid "Could not patch file"
msgstr "無法修補檔案"
@@ -2846,13 +2885,6 @@ msgstr "無法修補檔案"
msgid "Connection closed prematurely"
msgstr "連線突然終止"
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "動態 MMap 已用完所有空間。請增加 APT::Cache-Limit 的大小。目前大小為:%"
-#~ "lu。(man 5 apt.conf)"
-
#~ msgid "Release file expired, ignoring %s (valid until %s)"
#~ msgstr "Release 檔已過期,略過 %s(有效期限 %s)"